few more py3 fixes

CodernityDB/tree_index.py

@@ -24,7 +24,6 @@
 import io
 import shutil
 from .storage import IU_Storage
-# from ipdb import set_trace
 
 from CodernityDB.env import cdb_environment
 from CodernityDB.index import TryReindexException

lib/net_misc.py

@@ -472,7 +472,7 @@ def readResponse(response):
     return d
 
 
-def getPageTwisted(url, timeout=10):
+def getPageTwisted(url, timeout=10, method=b'GET'):
     """
     A smart way to download pages from HTTP hosts.
     """
@@ -502,9 +502,9 @@ def getPageTwisted(url, timeout=10):
     agent = Agent(reactor, connectTimeout=timeout)
 
     d = agent.request(
-        method=b'GET',
+        method=method,
         uri=url,
-        headers=Headers({'User-Agent': [_UserAgentString, ]}),
+        headers=Headers({b'User-Agent': [_UserAgentString, ]}),
     )
 #     d = getPage(url, agent=_UserAgentString, timeout=timeout)
 #     if timeout:

main/bpmain.py

@@ -170,6 +170,8 @@ def _tray_control_func(cmd):
 #    plug.init()
 #    reactor.addSystemEventTrigger('before', 'shutdown', plug.shutdown)
 
+    lg.out(2, "    python executable is: %s" % sys.executable)
+    lg.out(2, "    python version is:\n                %s" % sys.version)
     lg.out(2, "    python sys.path is:\n                %s" % ('\n                '.join(sys.path)))
 
     lg.out(2, "bpmain.run UI=[%s]" % UI)

p2p/lookup.py

@@ -453,7 +453,6 @@ def _on_node_observed(self, idurl, node):
             d.addCallback(self._on_identity_cached, node)
             return d
         except:
-            import pdb; pdb.set_trace()
             lg.exc()
             return idurl
 

updates/git_proc.py

@@ -276,8 +276,8 @@ class GitProcessProtocol(protocol.ProcessProtocol):
 
     def __init__(self, callbacks=[]):
         self.callbacks = callbacks
-        self.out = ''
-        self.err = ''
+        self.out = b''
+        self.err = b''
 
     def errReceived(self, inp):
         self.err += inp