Remove explicit unicode strings like u""

No longer required

Author: mvantellingen

src/zeep/cache.py

@@ -60,7 +60,7 @@ def _version_string(self):
         assert (
             getattr(self, "_version", None) is not None
         ), "A version must be provided in order to use the VersionedCacheBase backend."
-        prefix = u"$ZEEP:%s$" % self._version
+        prefix = "$ZEEP:%s$" % self._version
         return bytes(prefix.encode("ascii"))
 
 

src/zeep/wsdl/bindings/soap.py

@@ -179,7 +179,7 @@ def process_reply(self, client, operation, response):
 
         elif response.status_code != 200 and not response.content:
             raise TransportError(
-                u"Server returned HTTP status %d (no content available)"
+                "Server returned HTTP status %d (no content available)"
                 % response.status_code,
                 status_code=response.status_code,
             )

src/zeep/wsdl/definitions.py

@@ -212,11 +212,11 @@ def __repr__(self):
 
     def __str__(self):
         if not self.input:
-            return u"%s(missing input message)" % (self.name)
+            return "%s(missing input message)" % (self.name)
 
-        retval = u"%s(%s)" % (self.name, self.input.signature())
+        retval = "%s(%s)" % (self.name, self.input.signature())
         if self.output:
-            retval += u" -> %s" % (self.output.signature(as_output=True))
+            retval += " -> %s" % (self.output.signature(as_output=True))
         return retval
 
     def create(self, *args, **kwargs):
@@ -275,7 +275,7 @@ def __repr__(self):
         )
 
     def __str__(self):
-        return u"Port: %s (%s)" % (self.name, self.binding)
+        return "Port: %s (%s)" % (self.name, self.binding)
 
     def resolve(self, definitions):
         if self._resolve_context is None:
@@ -309,7 +309,7 @@ def __init__(self, name):
         self._is_resolved = False
 
     def __str__(self):
-        return u"Service: %s" % self.name
+        return "Service: %s" % self.name
 
     def __repr__(self):
         return "<%s(name=%r, ports=%r)>" % (

tests/test_helpers.py

@@ -167,7 +167,7 @@ def test_serialize_any_array():
 def test_create_xml_soap_map():
     data = OrderedDict(
         [
-            ("text", u"String"),
+            ("text", "String"),
             ("bytes", b"Bytes"),
             ("boolean", True),
             ("integer", 100),

tests/test_loader.py

@@ -11,23 +11,23 @@ def test_huge_text():
     # libxml2>=2.7.3 has XML_MAX_TEXT_LENGTH 10000000 without XML_PARSE_HUGE
     settings = Settings(xml_huge_tree=True)
     tree = parse_xml(
-        u"""
+        """
         <s:Envelope xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
          <s:Body>
           <HugeText xmlns="http://hugetext">%s</HugeText>
          </s:Body>
         </s:Envelope>
     """
-        % (u"\u00e5" * 10000001),
+        % ("\u00e5" * 10000001),
         DummyTransport(),
         settings=settings,
     )
 
-    assert tree[0][0].text == u"\u00e5" * 10000001
+    assert tree[0][0].text == "\u00e5" * 10000001
 
 
 def test_allow_entities_and_dtd():
-    xml = u"""
+    xml = """
         <!DOCTYPE Author [
           <!ENTITY writer "Donald Duck.">
         ]>

tests/test_soap_multiref.py

@@ -10,7 +10,7 @@
 @pytest.mark.requests
 def test_parse_multiref_soap_response():
     wsdl_file = io.StringIO(
-        u"""
+        """
         <?xml version="1.0"?>
         <wsdl:definitions
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
@@ -134,7 +134,7 @@ def test_parse_multiref_soap_response():
 @pytest.mark.requests
 def test_parse_multiref_soap_response_child():
     wsdl_file = io.StringIO(
-        u"""
+        """
         <?xml version="1.0"?>
         <wsdl:definitions
           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"

tests/test_wsdl.py

@@ -935,7 +935,7 @@ def test_wsdl_duplicate_tns(recwarn):
 
 
 def test_wsdl_dtd_entities_rules():
-    wsdl_declaration = u"""<!DOCTYPE Author [
+    wsdl_declaration = """<!DOCTYPE Author [
         <!ENTITY writer "Donald Duck.">
         ]>
         <wsdl:definitions

tests/test_xsd_types.py

@@ -115,7 +115,7 @@ def test_simpletype_call_wrong_kwarg():
 
 def test_simpletype_str():
     item = types.AnySimpleType()
-    item.name = u"foobar"
+    item.name = "foobar"
     assert str(item) == "AnySimpleType(value)"