Python3 corrections

bitsd.py

-#! /usr/bin/env python2
+#! /usr/bin/env python3
 
 from bitsd.main import main
 

bitsd/listener/handlers.py

@@ -26,7 +26,7 @@ def send(string):
         LOG.error("No Fonera connected! Not sending %r", string)
         return
     try:
-        RemoteListener.STREAM.write(string)
+        RemoteListener.STREAM.write(string.encode('utf-8'))
     except StreamClosedError as error:
         LOG.error('Could not push message to Fonera! %s', error)
 
@@ -107,7 +107,7 @@ class RemoteListener(tornado.tcpserver.TCPServer):
         # Meanwhile, go on with commands...
         RemoteListener.STREAM.read_until(b'\n', self.handle_command)
 
-        command = command.strip('\n')
+        command = command.strip(b'\n')
 
         if command:
             args = command.split(b' ')

bitsd/persistence/engine.py

@@ -93,6 +93,8 @@ def query_by_attribute(session, model, attribute, value, first=True):
     """Query all instances of `model` having `attribute == value`.
     If first is True, only first result will be returned (useful
     if attribute is a primary/candidate key)."""
+    if isinstance(value, bytes):
+        value = value.decode('utf-8')
     query = session.query(model).filter_by(**{attribute: value})
     result = query.first() if first else query
     return result

bitsd/server/handlers.py

@@ -338,6 +338,7 @@ class MessagePageHandler(BaseHandler):
 
         with session_scope() as session:
             user = query.get_user(session, username)
+            print(user)
             message = query.log_message(session, user, text)
             LOG.info("Broadcasting to clients")
             broadcast(message.jsondict())

bootstrap.py

-#! /usr/bin/env python2
+#! /usr/bin/env python3
 #
 # Copyright (C) 2013 Stefano Sanfilippo
 # Copyright (C) 2013 BITS development team
@@ -29,6 +29,6 @@ if __name__ == '__main__':
     start()
 
     with open('INFO.md', 'r') as info:
-        infopage = Page('Info', info.read().decode('utf-8'))
+        infopage = Page('Info', info.read())
         with session_scope() as session:
             persist(session, infopage)

setup.py

-#! /usr/bin/env python2
+#! /usr/bin/env python3
 #
 # Copyright (C) 2013 Stefano Sanfilippo
 # Copyright (C) 2013 BITS development team
@@ -23,8 +23,7 @@ setup(
         'markdown',
         'futures',
         'pycares',
-        'passlib',
-        'recaptcha'
+        'passlib'
     ],
     packages=[
         'bitsd',

usermanage.py

-#! /usr/bin/env python2
+#! /usr/bin/env python3
 #
 # Copyright (C) 2013 Stefano Sanfilippo
 # Copyright (C) 2013 BITS development team