Ensure proper quoting for various operators

With a small refactor, and some better logic and naming, we can easily
fix the issue of double escaping %s in strings they should not be
escaped in.

Closes #99

Author: sigmavirus24

tests/test_from_fixtures.py

@@ -53,7 +53,11 @@ def _test(self, testname: str) -> None:
         for template, expected in testcases:
             expected_templates = expected_set(expected)
             expanded = uritemplate.expand(template, variables)
-            assert expanded in expected_templates
+            assert expanded in expected_templates, (  # nosec
+                f"expanded {template!r} with {variables!r} "
+                f"and got {expanded!r} but expected one of "
+                f"{expected_templates!r}"
+            )
 
 
 class TestSpecExamples(FixtureMixin):

tests/test_uritemplate.py

@@ -562,7 +562,7 @@ def test_semi_path_expansion(self) -> None:
         self.assertEqual(
             v._semi_path_expansion("foo", None, False, False), None
         )
-        t.variables[0].operator = "?"
+        t.variables[0].operator = variable.Operator.form_style_query
         self.assertEqual(
             v._semi_path_expansion("foo", ["bar", "bogus"], True, False),
             "foo=bar&foo=bogus",
@@ -588,50 +588,6 @@ def test_no_mutate(self) -> None:
         self.assertEqual(args, {})
 
 
-class TestURIVariable(unittest.TestCase):
-    def setUp(self) -> None:
-        self.v = variable.URIVariable("{foo}")
-
-    def test_post_parse(self) -> None:
-        v = self.v
-        self.assertEqual(v.join_str, ",")
-        self.assertEqual(v.operator, "")
-        self.assertEqual(v.safe, "")
-        self.assertEqual(v.start, "")
-
-    def test_post_parse_plus(self) -> None:
-        v = self.v
-        v.operator = "+"
-        v.post_parse()
-        self.assertEqual(v.join_str, ",")
-        self.assertEqual(v.safe, variable.URIVariable.reserved)
-        self.assertEqual(v.start, "")
-
-    def test_post_parse_octothorpe(self) -> None:
-        v = self.v
-        v.operator = "#"
-        v.post_parse()
-        self.assertEqual(v.join_str, ",")
-        self.assertEqual(v.safe, variable.URIVariable.reserved)
-        self.assertEqual(v.start, "#")
-
-    def test_post_parse_question(self) -> None:
-        v = self.v
-        v.operator = "?"
-        v.post_parse()
-        self.assertEqual(v.join_str, "&")
-        self.assertEqual(v.safe, "")
-        self.assertEqual(v.start, "?")
-
-    def test_post_parse_ampersand(self) -> None:
-        v = self.v
-        v.operator = "&"
-        v.post_parse()
-        self.assertEqual(v.join_str, "&")
-        self.assertEqual(v.safe, "")
-        self.assertEqual(v.start, "&")
-
-
 class TestVariableModule(unittest.TestCase):
     def test_is_list_of_tuples(self) -> None:
         a_list = [(1, 2), (3, 4)]