Make pywatchman run on Python 3

Refs: #219
facebook · Feb 25, 2016 · af477d0 · af477d0
1 parent c95bf46
commit af477d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/python/pywatchman/__init__.py b/python/pywatchman/__init__.py
@@ -37,7 +37,7 @@
 # so fall back to a pure Python implementation.
 try:
     import bser
-except ImportError, e:
+except ImportError:
     import pybser as bser
 
 import capabilities

diff --git a/python/pywatchman/pybser.py b/python/pywatchman/pybser.py
@@ -29,6 +29,7 @@
 import collections
 import ctypes
 import struct
+import sys
 
 BSER_ARRAY = '\x00'
 BSER_OBJECT = '\x01'
@@ -49,6 +50,9 @@
 # int32 for the header
 EMPTY_HEADER = "\x00\x01\x05\x00\x00\x00\x00"
 
+# Python 3 conditional for supporting Python 2's int/long types
+if sys.version_info > (3,):
+    long = int
 
 def _int_size(x):
     """Return the smallest size int that can store the value"""
@@ -58,7 +62,7 @@ def _int_size(x):
         return 2
     elif -0x80000000 <= x <= 0x7FFFFFFF:
         return 4
-    elif -0x8000000000000000L <= x <= 0x7FFFFFFFFFFFFFFFL:
+    elif long(-0x8000000000000000) <= x <= long(0x7FFFFFFFFFFFFFFF):
         return 8
     else:
         raise RuntimeError('Cannot represent value: ' + str(x))