Adding long() for compatibility

pferate · pferate · commit fa8a6f4b425b · 2014-12-24T14:08:24.000-08:00
diff --git a/googleapiclient/discovery.py b/googleapiclient/discovery.py
@@ -79,6 +79,9 @@
 from oauth2client.util import _add_query_parameter
 from oauth2client.util import positional
 
+import sys
+if sys.version > '3':
+  long = int
 
 # The client library requires a version of httplib2 that supports RETRIES.
 httplib2.RETRIES = 1
@@ -339,7 +342,7 @@ def _media_size_to_long(maxSize):
     The size as an integer value.
   """
   if len(maxSize) < 2:
-    return 0L
+    return long(0)
   units = maxSize[-2:].upper()
   bit_shift = _MEDIA_SIZE_BIT_SHIFTS.get(units)
   if bit_shift is not None:
@@ -436,7 +439,7 @@ def _fix_up_media_upload(method_desc, root_desc, path_url, parameters):
         accepted for media upload. Defaults to empty list if not in the
         discovery document.
       - max_size is a long representing the max size in bytes allowed for a
-        media upload. Defaults to 0L if not in the discovery document.
+        media upload. Defaults to long(0) if not in the discovery document.
       - media_path_url is a String; the absolute URI for media upload for the
         API method. Constructed using the API root URI and service path from
         the discovery document and the relative path for the API method. If
@@ -481,7 +484,7 @@ def _fix_up_method_description(method_desc, root_desc):
         accepted for media upload. Defaults to empty list if not in the
         discovery document.
       - max_size is a long representing the max size in bytes allowed for a
-        media upload. Defaults to 0L if not in the discovery document.
+        media upload. Defaults to long(0) if not in the discovery document.
       - media_path_url is a String; the absolute URI for media upload for the
         API method. Constructed using the API root URI and service path from
         the discovery document and the relative path for the API method. If
diff --git a/tests/test_discovery.py b/tests/test_discovery.py
@@ -77,6 +77,9 @@
 
 import uritemplate
 
+import sys
+if sys.version > '3':
+  long = int
 
 DATA_DIR = os.path.join(os.path.dirname(__file__), 'data')
 
@@ -258,7 +261,7 @@ def test_fix_up_method_description_get(self):
     http_method = 'GET'
     method_id = 'bigquery.query'
     accept = []
-    max_size = 0L
+    max_size = long(0)
     media_path_url = None
     self.assertEqual(result, (path_url, http_method, method_id, accept,
                               max_size, media_path_url))
@@ -270,7 +273,7 @@ def test_fix_up_method_description_insert(self):
     http_method = 'POST'
     method_id = 'zoo.animals.insert'
     accept = ['image/png']
-    max_size = 1024L
+    max_size = long(1024)
     media_path_url = 'https://www.googleapis.com/upload/zoo/v1/animals'
     self.assertEqual(result, (path_url, http_method, method_id, accept,
                               max_size, media_path_url))
