Some basic Python 3 fixes

dlitz · dlitz · commit e3bc72d8e305 · 2014-08-26T12:05:26.000-07:00
Summary: - Add 'six>=1.4.1' to dependencies (for six.moves.urllib.parse) - Explicit relative imports - Replace sys.maxint with 2**64-1 (maybe we should do something smarter?) - Replace deprecated 'except' syntax with 'except...as' - Mandatory parens around the argument to print() Test Plan: The Flask server now starts under Python 3.4.1. I haven't tested it beyond that yet. Reviewers: charles Reviewed By: charles Differential Revision: https://review.inboxapp.com/D372
diff --git a/examples/server.py b/examples/server.py
@@ -51,8 +51,8 @@ def index():
         try:
             # Get the latest message from namespace zero.
             message = client.namespaces[0].messages.first()
-        except Exception, e:
-            print e.message
+        except Exception as e:
+            print(e.message)
 
         # Format the output
         text = "<html><h1>Here's a message from your Inbox:</h1><b>From:</b> "
diff --git a/inbox/__init__.py b/inbox/__init__.py
@@ -1,3 +1,3 @@
-from client import APIClient
+from .client import APIClient
 
 __all__ = ['APIClient']
diff --git a/inbox/client.py b/inbox/client.py
@@ -1,11 +1,12 @@
 import requests
+import six
 import json
 from base64 import b64encode
 from collections import namedtuple
-from urllib import urlencode
-from util import url_concat, generate_id
-from restful_model_collection import RestfulModelCollection
-from models import Namespace
+from six.moves.urllib.parse import urlencode
+from .util import url_concat, generate_id
+from .restful_model_collection import RestfulModelCollection
+from .models import Namespace
 
 API_SERVER = "https://api.inboxapp.com"
 
diff --git a/inbox/models.py b/inbox/models.py
@@ -1,4 +1,4 @@
-from restful_model_collection import RestfulModelCollection
+from .restful_model_collection import RestfulModelCollection
 
 
 class InboxAPIObject(dict):
diff --git a/inbox/restful_model_collection.py b/inbox/restful_model_collection.py
@@ -1,4 +1,3 @@
-from sys import maxint
 from copy import deepcopy
 
 CHUNK_SIZE = 50
@@ -32,6 +31,7 @@ def first(self):
         return self._get_model_collection(0, 1)[0]
 
     def all(self):
+        maxint = 2**64-1    # XXX
         return self.range(0, maxint)
 
     def where(self, **kwargs):
diff --git a/inbox/util.py b/inbox/util.py
@@ -1,4 +1,5 @@
-from urllib import urlencode
+import six
+from six.moves.urllib.parse import urlencode
 from uuid import uuid4
 from struct import unpack
 
diff --git a/setup.py b/setup.py
@@ -7,6 +7,7 @@
 
     install_requires = [
         "requests>=2.3.0",
+        "six>=1.4.1",
     ],
     dependency_links = [],
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-from client import APIClient`
	`1`	`+from .client import APIClient`
`2`	`2`
`3`	`3`	`__all__ = ['APIClient']`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from restful_model_collection import RestfulModelCollection`
	`1`	`+from .restful_model_collection import RestfulModelCollection`
`2`	`2`
`3`	`3`
`4`	`4`	`class InboxAPIObject(dict):`