Remove more unneeded u prefixes.

Author: Julian

docs/conf.py

@@ -45,9 +45,9 @@
 master_doc = "index"
 
 # General information about the project.
-project = u"jsonschema"
-author = u"Julian Berman"
-copyright = u"2013, " + author
+project = "jsonschema"
+author = "Julian Berman"
+copyright = "2013, " + author
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -171,7 +171,7 @@
 # Grouping the document tree into LaTeX files. List of tuples (source
 # start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-    ("index", "jsonschema.tex", u"jsonschema Documentation", author, "manual"),
+    ("index", "jsonschema.tex", "jsonschema Documentation", author, "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -199,7 +199,7 @@
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [("index", "jsonschema", u"jsonschema Documentation", [author], 1)]
+man_pages = [("index", "jsonschema", "jsonschema Documentation", [author], 1)]
 
 # If true, show URL addresses after external links.
 # man_show_urls = False
@@ -214,7 +214,7 @@
     (
         "index",
         "jsonschema",
-        u"jsonschema Documentation",
+        "jsonschema Documentation",
         author,
         "jsonschema",
         "One line description of project.",

jsonschema/_legacy_validators.py

@@ -10,9 +10,9 @@ def ignore_ref_siblings(schema):
 
     Suitable for use with `create`'s ``applicable_validators`` argument.
     """
-    ref = schema.get(u"$ref")
+    ref = schema.get("$ref")
     if ref is not None:
-        return [(u"$ref", ref)]
+        return [("$ref", ref)]
     else:
         return schema.items()
 

jsonschema/_types.py

@@ -166,19 +166,19 @@ def remove(self, *types):
 
 draft3_type_checker = TypeChecker(
     {
-        u"any": is_any,
-        u"array": is_array,
-        u"boolean": is_bool,
-        u"integer": is_integer,
-        u"object": is_object,
-        u"null": is_null,
-        u"number": is_number,
-        u"string": is_string,
+        "any": is_any,
+        "array": is_array,
+        "boolean": is_bool,
+        "integer": is_integer,
+        "object": is_object,
+        "null": is_null,
+        "number": is_number,
+        "string": is_string,
     },
 )
-draft4_type_checker = draft3_type_checker.remove(u"any")
+draft4_type_checker = draft3_type_checker.remove("any")
 draft6_type_checker = draft4_type_checker.redefine(
-    u"integer",
+    "integer",
     lambda checker, instance: (
         is_integer(checker, instance) or
         isinstance(instance, float) and instance.is_integer()

jsonschema/_validators.py

@@ -453,12 +453,12 @@ def not_(validator, not_schema, instance, schema):
 
 def if_(validator, if_schema, instance, schema):
     if validator.is_valid(instance, if_schema):
-        if u"then" in schema:
-            then = schema[u"then"]
+        if "then" in schema:
+            then = schema["then"]
             for error in validator.descend(instance, then, schema_path="then"):
                 yield error
-    elif u"else" in schema:
-        else_ = schema[u"else"]
+    elif "else" in schema:
+        else_ = schema["else"]
         for error in validator.descend(instance, else_, schema_path="else"):
             yield error
 

jsonschema/tests/test_exceptions.py

@@ -288,11 +288,11 @@ def test_if_its_in_the_tree_anyhow_it_does_not_raise_an_error(self):
 class TestErrorInitReprStr(TestCase):
     def make_error(self, **kwargs):
         defaults = dict(
-            message=u"hello",
-            validator=u"type",
-            validator_value=u"string",
+            message="hello",
+            validator="type",
+            validator_value="string",
             instance=5,
-            schema={u"type": u"string"},
+            schema={"type": "string"},
         )
         defaults.update(kwargs)
         return exceptions.ValidationError(**defaults)
@@ -367,8 +367,8 @@ def test_multiple_item_paths(self):
             On instance[0]['a']:
                 5
             """,
-            path=[0, u"a"],
-            schema_path=[u"items", 0, 1],
+            path=[0, "a"],
+            schema_path=["items", 0, 1],
         )
 
     def test_uses_pprint(self):
@@ -425,7 +425,7 @@ def test_uses_pprint(self):
             """,
             instance=list(range(25)),
             schema=dict(zip(range(20), range(20))),
-            validator=u"maxLength",
+            validator="maxLength",
         )
 
     def test_str_works_with_instances_having_overriden_eq_operator(self):

jsonschema/tests/test_types.py

@@ -142,7 +142,7 @@ def test_object_can_be_extended(self):
         Point = namedtuple("Point", ["x", "y"])
 
         type_checker = Draft4Validator.TYPE_CHECKER.redefine(
-            u"object", is_object_or_named_tuple,
+            "object", is_object_or_named_tuple,
         )
 
         CustomValidator = extend(Draft4Validator, type_checker=type_checker)
@@ -154,7 +154,7 @@ def test_object_extensions_require_custom_validators(self):
         schema = {"type": "object", "required": ["x"]}
 
         type_checker = Draft4Validator.TYPE_CHECKER.redefine(
-            u"object", is_object_or_named_tuple,
+            "object", is_object_or_named_tuple,
         )
 
         CustomValidator = extend(Draft4Validator, type_checker=type_checker)
@@ -173,7 +173,7 @@ def test_object_extensions_can_handle_custom_validators(self):
         }
 
         type_checker = Draft4Validator.TYPE_CHECKER.redefine(
-            u"object", is_object_or_named_tuple,
+            "object", is_object_or_named_tuple,
         )
 
         CustomValidator = extend(