Merge pull request #15 from neubot/issue-3

six.py updated

.gitignore

@@ -1 +1,2 @@
 *.pyc
+*.swp

neubot_runtime/compat23.py

@@ -0,0 +1,38 @@
+#
+# Buffer / memoryview, urlparse
+# Written by Simone Basso
+#
+
+import sys
+
+PY3 = sys.version_info[0] == 3
+
+if PY3:
+    def buff(string, offset, size=None):
+        if not size:
+            size = len(string)
+        return memoryview(string)[offset:offset + size]
+
+    import urllib.parse as urlparse
+    from collections import OrderedDict
+
+    def bytes_to_string(octets, encoding):
+        return str(octets, encoding)
+
+    def bytes_to_string_safe(octets, encoding):
+        return str(octets, encoding, errors='ignore')
+
+else:
+    def buff(string, offset, size=None):
+        if not size:
+            size = len(string)
+        return buffer(string, offset, size)
+
+    import urlparse
+    from .third_party.ordered_dict import OrderedDict
+
+    def bytes_to_string(octets, encoding):
+        return octets
+
+    def bytes_to_string_safe(octets, encoding):
+        return octets

neubot_runtime/http_misc.py

@@ -4,7 +4,7 @@
 
 ''' HTTP misc functions '''
 
-from .third_party.six import urlparse
+from .third_party.six.moves.urllib import parse as urlparse
 
 from .http_states import BOUNDED
 from .http_states import UNBOUNDED

neubot_runtime/http_stream.py

@@ -20,7 +20,7 @@
 from .http_states import TRAILER
 from .http_states import ERROR
 
-from .third_party import six
+from . import compat23
 
 # Maximum allowed line length
 MAXLINE = 1 << 15
@@ -118,7 +118,7 @@ def recv_complete(self, data):
                 logging.debug("looking for %d more bytes", self._left)
                 count = min(self._left, length)
                 logging.debug("capping bytes to %d", count)
-                piece = six.buff(data, offset, count)
+                piece = compat23.buff(data, offset, count)
                 logging.debug("found %d-bytes piece", len(piece))
                 self._left -= count
                 offset += count

neubot_runtime/stream.py

@@ -9,7 +9,7 @@
 import socket
 
 from .pollable import Pollable
-from .third_party import six
+from . import compat23
 from . import utils_net
 
 # Maximum amount of bytes we read from a socket
@@ -186,7 +186,7 @@ def handle_write(self):
                         self.poller.close(self)
                     return
                 if count < len(self.send_octets):
-                    self.send_octets = six.buff(self.send_octets, count)
+                    self.send_octets = compat23.buff(self.send_octets, count)
                     return
                 raise RuntimeError("Sent more than expected")
             if count == len(self.send_octets) == 0: