UTF-8 encode added

suds/wsse.py

@@ -141,7 +141,7 @@ def setnonce(self, text=None):
             s.append(self.password)
             s.append(Token.sysdate())
             m = md5()
-            m.update(':'.join(s))
+            m.update(':'.join(s).encode("UTF-8"))
             self.nonce = m.hexdigest()
         else:
             self.nonce = text

suds/xsd/sxbase.py

@@ -94,6 +94,10 @@ def __init__(self, schema, root):
         self.qname = (self.name, schema.tns[1])
         self.min = root.get('minOccurs')
         self.max = root.get('maxOccurs')
+        self.totalDigits = None
+        if root.getChild('restriction'):
+            if root.getChild('restriction').getChild('totalDigits') is not None:
+                self.totalDigits = root.getChild('restriction').getChild('totalDigits').get('value')
         self.type = root.get('type')
         self.ref = root.get('ref')
         self.form_qualified = schema.form_qualified
@@ -463,7 +467,7 @@ def description(self):
         return ()
 
     def __unicode__(self):
-        return unicode(self.str())
+        return str(self.str())
 
     def __repr__(self):
         s = []
@@ -520,7 +524,7 @@ def __init__(self, sx):
             self.items = sx.rawchildren
             self.index = 0
 
-        def next(self):
+        def __next__(self):
             """
             Get the I{next} item in the frame's collection.
             @return: The next item or None
@@ -571,7 +575,7 @@ def top(self):
         else:
             raise StopIteration()
 
-    def next(self):
+    def __next__(self):
         """
         Get the next item.
         @return: A tuple: the next (child, ancestry).
@@ -580,15 +584,15 @@ def next(self):
         """
         frame = self.top()
         while True:
-            result = frame.next()
+            result = next(frame)
             if result is None:
                 self.pop()
-                return self.next()
+                return next(self)
             if isinstance(result, Content):
                 ancestry = [f.sx for f in self.stack]
                 return result, ancestry
             self.push(result)
-            return self.next()
+            return next(self)
 
     def __iter__(self):
         return self

suds/xsd/sxbasic.py

@@ -26,7 +26,7 @@
 from suds.sax import Namespace
 from suds.transport import TransportError
 from suds.reader import DocumentReader
-from urlparse import urljoin
+from urllib.parse import urljoin
 
 from logging import getLogger
 log = getLogger(__name__)
@@ -670,7 +670,7 @@ def __applytns(self, root):
             root.set(TNS, tns)
         else:
             if self.schema.tns[1] != tns:
-                raise Exception, '%s mismatch' % TNS
+                raise Exception('%s mismatch' % TNS)
 
 
     def description(self):