Merge branch 'develop' into develop-1.1

5 files changed, 49 insertions, 32 deletions

diff --git a/sleekxmpp/plugins/xep_0009/binding.py b/sleekxmpp/plugins/xep_0009/binding.py
index ef34b580..b4395707 100644
--- a/sleekxmpp/plugins/xep_0009/binding.py
+++ b/sleekxmpp/plugins/xep_0009/binding.py
@@ -42,46 +42,46 @@ def py2xml(*args):
 
 def _py2xml(*args):
     for x in args:
-        val = ET.Element("value")
+        val = ET.Element("{%s}value" % _namespace)
         if x is None:
-            nil = ET.Element("nil")
+            nil = ET.Element("{%s}nil" % _namespace)
             val.append(nil)
         elif type(x) is int:
-            i4 = ET.Element("i4")
+            i4 = ET.Element("{%s}i4" % _namespace)
             i4.text = str(x)
             val.append(i4)
         elif type(x) is bool:
-            boolean = ET.Element("boolean")
+            boolean = ET.Element("{%s}boolean" % _namespace)
             boolean.text = str(int(x))
             val.append(boolean)
         elif type(x) is str:
-            string = ET.Element("string")
+            string = ET.Element("{%s}string" % _namespace)
             string.text = x
             val.append(string)
         elif type(x) is float:
-            double = ET.Element("double")
+            double = ET.Element("{%s}double" % _namespace)
             double.text = str(x)
             val.append(double)
         elif type(x) is rpcbase64:
-            b64 = ET.Element("base64")
+            b64 = ET.Element("{%s}base64" % _namespace)
             b64.text = x.encoded()
             val.append(b64)
         elif type(x) is rpctime:
-            iso = ET.Element("dateTime.iso8601")
+            iso = ET.Element("{%s}dateTime.iso8601" % _namespace)
             iso.text = str(x)
             val.append(iso)
         elif type(x) in (list, tuple):
-            array = ET.Element("array")
-            data = ET.Element("data")
+            array = ET.Element("{%s}array" % _namespace)
+            data = ET.Element("{%s}data" % _namespace)
             for y in x:
                 data.append(_py2xml(y))
             array.append(data)
             val.append(array)
         elif type(x) is dict:
-            struct = ET.Element("struct")
+            struct = ET.Element("{%s}struct" % _namespace)
             for y in x.keys():
-                member = ET.Element("member")
-                name = ET.Element("name")
+                member = ET.Element("{%s}member" % _namespace)
+                name = ET.Element("{%s}name" % _namespace)
                 name.text = y
                 member.append(name)
                 member.append(_py2xml(x[y]))
@@ -105,18 +105,18 @@ def _xml2py(value):
     if value.find('{%s}int' % namespace) is not None:
         return int(value.find('{%s}int' % namespace).text)
     if value.find('{%s}boolean' % namespace) is not None:
-        return bool(value.find('{%s}boolean' % namespace).text)
+        return bool(int(value.find('{%s}boolean' % namespace).text))
     if value.find('{%s}string' % namespace) is not None:
         return value.find('{%s}string' % namespace).text
     if value.find('{%s}double' % namespace) is not None:
         return float(value.find('{%s}double' % namespace).text)
-    if value.find('{%s}base64') is not None:
-        return rpcbase64(value.find('base64' % namespace).text)
-    if value.find('{%s}Base64') is not None:
+    if value.find('{%s}base64' % namespace) is not None:
+        return rpcbase64(value.find('{%s}base64' % namespace).text.encode())
+    if value.find('{%s}Base64' % namespace) is not None:
         # Older versions of XEP-0009 used Base64
-        return rpcbase64(value.find('Base64' % namespace).text)
-    if value.find('{%s}dateTime.iso8601') is not None:
-        return rpctime(value.find('{%s}dateTime.iso8601'))
+        return rpcbase64(value.find('{%s}Base64' % namespace).text.encode())
+    if value.find('{%s}dateTime.iso8601' % namespace) is not None:
+        return rpctime(value.find('{%s}dateTime.iso8601' % namespace).text)
     if value.find('{%s}struct' % namespace) is not None:
         struct = {}
         for member in value.find('{%s}struct' % namespace).findall('{%s}member' % namespace):
@@ -138,13 +138,13 @@ class rpcbase64(object):
         self.data = data
 
     def decode(self):
-        return base64.decodestring(self.data)
+        return base64.b64decode(self.data)
 
     def __str__(self):
-        return self.decode()
+        return self.decode().decode()
 
     def encoded(self):
-        return self.data
+        return self.data.decode()
 
 
 
diff --git a/sleekxmpp/plugins/xep_0009/remote.py b/sleekxmpp/plugins/xep_0009/remote.py
index 1e3b504a..8c08e8f3 100644
--- a/sleekxmpp/plugins/xep_0009/remote.py
+++ b/sleekxmpp/plugins/xep_0009/remote.py
@@ -113,6 +113,9 @@ class ACL:
     def check(cls, rules, jid, resource):
         if rules is None:
             return cls.DENY                  # No rules means no access!
+        jid = str(jid)     # Check the string representation of the JID.
+        if not jid:
+            return cls.DENY                  # Can't check an empty JID.
         for rule in rules:
             policy = cls._check(rule, jid, resource)
             if policy is not None:
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
index 46374a35..aeaeefe0 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub_errors.py
@@ -22,7 +22,7 @@ class PubsubErrorCondition(ElementBase):
                       'max-items-exceeded', 'max-nodes-exceeded',
                       'nodeid-required', 'not-in-roster-group',
                       'not-subscribed', 'payload-too-big',
-                      'payload-required' 'pending-subscription',
+                      'payload-required', 'pending-subscription',
                       'presence-subscription-required', 'subid-required',
                       'too-many-subscriptions', 'unsupported'))
     condition_ns = 'http://jabber.org/protocol/pubsub#errors'
diff --git a/sleekxmpp/plugins/xep_0082.py b/sleekxmpp/plugins/xep_0082.py
index b1bb0263..25c80fd0 100644
--- a/sleekxmpp/plugins/xep_0082.py
+++ b/sleekxmpp/plugins/xep_0082.py
@@ -76,7 +76,7 @@ def format_datetime(time_obj):
         return '%sZ' % timestamp
     return timestamp
 
-def date(year=None, month=None, day=None):
+def date(year=None, month=None, day=None, obj=False):
     """
     Create a date only timestamp for the given instant.
 
@@ -86,6 +86,8 @@ def date(year=None, month=None, day=None):
         year   -- Integer value of the year (4 digits)
         month  -- Integer value of the month
         day    -- Integer value of the day of the month.
+        obj    -- If True, return the date object instead
+                  of a formatted string. Defaults to False.
     """
     today = dt.datetime.utcnow()
     if year is None:
@@ -94,9 +96,12 @@ def date(year=None, month=None, day=None):
         month = today.month
     if day is None:
         day = today.day
-    return format_date(dt.date(year, month, day))
+    value = dt.date(year, month, day)
+    if obj:
+        return value 
+    return format_date(value)
 
-def time(hour=None, min=None, sec=None, micro=None, offset=None):
+def time(hour=None, min=None, sec=None, micro=None, offset=None, obj=False):
     """
     Create a time only timestamp for the given instant.
 
@@ -110,6 +115,8 @@ def time(hour=None, min=None, sec=None, micro=None, offset=None):
         offset -- Either a positive or negative number of seconds
                   to offset from UTC to match a desired timezone,
                   or a tzinfo object.
+        obj    -- If True, return the time object instead
+                  of a formatted string. Defaults to False.
     """
     now = dt.datetime.utcnow()
     if hour is None:
@@ -124,12 +131,14 @@ def time(hour=None, min=None, sec=None, micro=None, offset=None):
         offset = tzutc()
     elif not isinstance(offset, dt.tzinfo):
         offset = tzoffset(None, offset)
-    time = dt.time(hour, min, sec, micro, offset)
-    return format_time(time)
+    value = dt.time(hour, min, sec, micro, offset)
+    if obj:
+        return value
+    return format_time(value)
 
 def datetime(year=None, month=None, day=None, hour=None,
              min=None, sec=None, micro=None, offset=None,
-             separators=True):
+             separators=True, obj=False):
     """
     Create a datetime timestamp for the given instant.
 
@@ -146,6 +155,8 @@ def datetime(year=None, month=None, day=None, hour=None,
         offset -- Either a positive or negative number of seconds
                   to offset from UTC to match a desired timezone,
                   or a tzinfo object.
+        obj    -- If True, return the datetime object instead
+                  of a formatted string. Defaults to False.
     """
     now = dt.datetime.utcnow()
     if year is None:
@@ -167,9 +178,11 @@ def datetime(year=None, month=None, day=None, hour=None,
     elif not isinstance(offset, dt.tzinfo):
         offset = tzoffset(None, offset)
 
-    date = dt.datetime(year, month, day, hour,
+    value = dt.datetime(year, month, day, hour,
                        min, sec, micro, offset)
-    return format_datetime(date)
+    if obj:
+        return value 
+    return format_datetime(value)
 
 class xep_0082(base_plugin):
 
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 66dd657a..d5029928 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -1190,6 +1190,7 @@ class XMLStream(object):
                 shutdown = True
             except SyntaxError as e:
                 log.error("Error reading from XML stream.")
+                shutdown = True
                 self.exception(e)
             except Socket.error as serr:
                 self.event('socket_error', serr)