Improved handling of strings, converting to and from Unicode strings where needed and using byte strings when sending socket data and interacting with the operating system. Tried to make the modules compatible with both Python 2 and Python 3.

David Boddie committed 8 years ago

Commit 20f573c1 parent c2476e84 files · +66 −51Browse files

Showing the changes to dictserver.py (1 of 4 files). Show all

Unified · Split

 #!/usr/bin/env python
+# -*- encoding: utf8 -*-
 # dictserver.py - Serves the contents of a Python dictionary.
 #
     def get_root_qid(self, fid, afid, uname, aname):
-        qid = self.make_qid("")
+        qid = self.make_qid(u"/")
-        self.set_qid_path(fid, qid, "")
+        self.set_qid_path(fid, qid, u"/")
         self.root_fid = fid
         return qid
     def set_qid_path(self, fid, qid, path):
-        path = path.lstrip("/")
+        path = path.lstrip(u"/")
         self.qids[fid] = qid
         self.paths[fid] = path
     def make_qid(self, path):
-        path = path.lstrip("/")
+        path = path.lstrip(u"/")
         obj = self.traverse(path)
         if obj == None:
     def _stat(self, qid, path):
-        path = path.lstrip("/")
+        path = path.lstrip(u"/")
         obj = self.traverse(path)
         if type(obj) == dict:
             mode = 0x80000000
             size = 0
-            mode |= 0555
+            mode |= 0o555
         else:
             mode = 0
             size = len(obj)
-            mode |= 0444
+            mode |= 0o444
-        name = path.split("/")[-1]
+        name = path.split(u"/")[-1]
         return styx.Stat(0, 0, qid, mode, self.now, self.now, size, name,
-                         "inferno", "inferno", "")
+                         u"inferno", u"inferno", u"")
     def create(self, fid, name, perm):
         return False
         if obj == None:
             return None
-        data = ""
+        data = b""
         if type(obj) == dict:
             files.sort()
             for file_name in files:
-                qid = self.make_qid(path + "/" + file_name)
+                qid = self.make_qid(path + u"/" + file_name)
-                data += self._stat(qid, path + "/" + file_name).encode()
+                data += self._stat(qid, path + u"/" + file_name).encode()
             return data[offset:offset + count]
         else:
-            return obj[offset:offset + count]
+            return obj[offset:offset + count].encode("utf8")
     def write(self, fid, offset, data):
         return -2
     def remove(self, fid):
-        return False
+        return u"Cannot remove dictionary entries."
     def wstat(self, fid, st):
         pass
     def traverse(self, path):
-        if path == "":
+        if path == u"":
             return self.d
         obj = self.d
-        for element in path.split("/"):
+        for element in path.split(u"/"):
             try:
                 obj = obj[element]
     port = int(sys.argv[1])
     dictionary = {
-        "dir": {
+        u"dir": {
-            "hello.txt": "Hello world!\n"
+            u"hello.txt": u"Hello world!\n",
+            u"\u263a": u"Forståelse"
             }
         }
     store = DictStore(dictionary)
     server = styxserver.StyxServer(store)
-    server.serve("", port)
+    server.serve(b"", port)