Revert "[py] Make scripts Python 3 compatible"

This reverts commit 73829ba.

Author: Philip Langdale

python/Makefile

@@ -29,11 +29,6 @@ test:
 	@echo 'Running tests...'
 	PYTHONPATH=src python -m unittest discover src/cm_api_tests
 
-.PHONY: test_py3
-test_py3:
-	@echo 'Running tests...'
-	PYTHONPATH=src python3 -m unittest discover src/cm_api_tests
-
 .PHONY: dist
 dist: test
 	git rev-parse HEAD > .git-hash

python/src/cm_api/endpoints/services.py

@@ -1472,14 +1472,14 @@ def create_replication_schedule(self,
 
     if self.type == 'HDFS':
       if not isinstance(arguments, ApiHdfsReplicationArguments):
-        raise TypeError('Unexpected type for HDFS replication argument.')
+        raise TypeError, 'Unexpected type for HDFS replication argument.'
       schedule.hdfsArguments = arguments
     elif self.type == 'HIVE':
       if not isinstance(arguments, ApiHiveReplicationArguments):
-        raise TypeError('Unexpected type for Hive replication argument.')
+        raise TypeError, 'Unexpected type for Hive replication argument.'
       schedule.hiveArguments = arguments
     else:
-      raise TypeError('Replication is not supported for service type ' + self.type)
+      raise TypeError, 'Replication is not supported for service type ' + self.type
 
     return self._post("replications", ApiReplicationSchedule, True, [schedule],
         api_version=3)[0]

python/src/cm_api/endpoints/types.py

@@ -21,7 +21,6 @@
 
 import copy
 import datetime
-import six
 import time
 
 __docformat__ = "epytext"
@@ -132,7 +131,7 @@ def call(method, path, ret_type,
   @param params: Optional query parameters for the call.
   @param api_version: minimum API version for the call.
   """
-  check_api_version(method.__self__, api_version)
+  check_api_version(method.im_self, api_version)
   if data is not None:
     data = json.dumps(Attr(is_api_list=True).to_json(data, False))
     ret = method(path, data=data, params=params)
@@ -141,11 +140,11 @@ def call(method, path, ret_type,
   if ret_type is None:
     return
   elif ret_is_list:
-    return ApiList.from_json_dict(ret, method.__self__, ret_type)
+    return ApiList.from_json_dict(ret, method.im_self, ret_type)
   elif isinstance(ret, list):
-    return [ ret_type.from_json_dict(x, method.__self__) for x in ret ]
+    return [ ret_type.from_json_dict(x, method.im_self) for x in ret ]
   else:
-    return ret_type.from_json_dict(ret, method.__self__)
+    return ret_type.from_json_dict(ret, method.im_self)
 
 class BaseApiObject(object):
   """
@@ -192,7 +191,7 @@ def init(obj, resource_root, attrs=None):
     # We use unicode strings as keys in kwargs.
     str_attrs = { }
     if attrs:
-      for k, v in six.iteritems(attrs):
+      for k, v in attrs.iteritems():
         if k not in ('self', 'resource_root'):
           str_attrs[k] = v
     BaseApiObject.__init__(obj, resource_root, **str_attrs)
@@ -209,7 +208,7 @@ def __init__(self, resource_root, **attrs):
     """
     self._resource_root = resource_root
 
-    for name, attr in six.iteritems(self._get_attributes()):
+    for name, attr in self._get_attributes().iteritems():
       object.__setattr__(self, name, None)
     if attrs:
       self._set_attrs(attrs, from_json=False)
@@ -220,7 +219,7 @@ def _set_attrs(self, attrs, allow_ro=False, from_json=True):
     read-only attributes (e.g. when deserializing from JSON) and skipping
     JSON deserialization of values.
     """
-    for k, v in six.iteritems(attrs):
+    for k, v in attrs.iteritems():
       attr = self._check_attr(k, allow_ro)
       if attr and from_json:
         v = attr.from_json(self._get_resource_root(), v)
@@ -255,12 +254,12 @@ def _update(self, api_obj):
       try:
         val = getattr(api_obj, name)
         setattr(self, name, val)
-      except AttributeError as ignored:
+      except AttributeError, ignored:
         pass
 
   def to_json_dict(self, preserve_ro=False):
     dic = { }
-    for name, attr in six.iteritems(self._get_attributes()):
+    for name, attr in self._get_attributes().iteritems():
       if not preserve_ro and attr and not attr.rw:
         continue
       try:
@@ -486,7 +485,7 @@ class ApiCommand(BaseApiObject):
 
   @classmethod
   def _get_attributes(cls):
-    if '_ATTRIBUTES' not in cls.__dict__:
+    if not cls.__dict__.has_key('_ATTRIBUTES'):
       cls._ATTRIBUTES = {
         'id'            : ROAttr(),
         'name'          : ROAttr(),
@@ -761,7 +760,7 @@ class ApiHiveReplicationResult(BaseApiObject):
 class ApiReplicationCommand(ApiCommand):
   @classmethod
   def _get_attributes(cls):
-    if '_ATTRIBUTES' not in cls.__dict__:
+    if not cls.__dict__.has_key('_ATTRIBUTES'):
       attrs = {
         'hdfsResult'  : ROAttr(ApiHdfsReplicationResult),
         'hiveResult'  : ROAttr(ApiHiveReplicationResult),
@@ -1114,7 +1113,7 @@ def config_to_api_list(dic):
   @return: JSON dictionary of an ApiConfig list (*not* an ApiList).
   """
   config = [ ]
-  for k, v in six.iteritems(dic):
+  for k, v in dic.iteritems():
     config.append({ 'name' : k, 'value': v })
   return { ApiList.LIST_KEY : config }
 

python/src/cm_api/http_client.py

@@ -14,12 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
 import os
+import cookielib
+import logging
 import posixpath
 import types
-from six.moves import http_cookiejar
-from six.moves import urllib
+import urllib
 
 try:
   import socks
@@ -32,6 +32,8 @@
 except ImportError:
   pass
 
+import urllib2
+
 __docformat__ = "epytext"
 
 LOG = logging.getLogger(__name__)
@@ -45,7 +47,7 @@ def __init__(self, error):
     self._error = error
     self._code = None
     self._message = str(error)
-    # See if there is a code or a message. (For urllib.error.HTTPError.)
+    # See if there is a code or a message. (For urllib2.HTTPError.)
     try:
       self._code = error.code
       self._message = error.read()
@@ -89,15 +91,15 @@ def __init__(self, base_url, exc_class=None, logger=None):
     self._headers = { }
 
     # Make a basic auth handler that does nothing. Set credentials later.
-    self._passmgr = urllib.request.HTTPPasswordMgrWithDefaultRealm()
-    authhandler = urllib.request.HTTPBasicAuthHandler(self._passmgr)
+    self._passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
+    authhandler = urllib2.HTTPBasicAuthHandler(self._passmgr)
 
     # Make a cookie processor
-    cookiejar = http_cookiejar.CookieJar()
+    cookiejar = cookielib.CookieJar()
 
-    self._opener = urllib.request.build_opener(
+    self._opener = urllib2.build_opener(
         HTTPErrorProcessor(),
-        urllib.request.HTTPCookieProcessor(cookiejar),
+        urllib2.HTTPCookieProcessor(cookiejar),
         authhandler)
 
 
@@ -145,7 +147,7 @@ def execute(self, http_method, path, params=None, data=None, headers=None):
     @param data: The data to attach to the body of the request.
     @param headers: The headers to set for this request.
 
-    @return: The result of urllib.request.urlopen()
+    @return: The result of urllib2.urlopen()
     """
     # Prepare URL and params
     url = self._make_url(path, params)
@@ -156,8 +158,8 @@ def execute(self, http_method, path, params=None, data=None, headers=None):
         data = None
 
     # Setup the request
-    request = urllib.request.Request(url, data)
-    # Hack/workaround because urllib only does GET and POST
+    request = urllib2.Request(url, data)
+    # Hack/workaround because urllib2 only does GET and POST
     request.get_method = lambda: http_method
 
     headers = self._get_headers(headers)
@@ -168,28 +170,28 @@ def execute(self, http_method, path, params=None, data=None, headers=None):
     self.logger.debug("%s %s" % (http_method, url))
     try:
       return self._opener.open(request)
-    except urllib.error.HTTPError as ex:
+    except urllib2.HTTPError, ex:
       raise self._exc_class(ex)
 
   def _make_url(self, path, params):
     res = self._base_url
     if path:
       res += posixpath.normpath('/' + path.lstrip('/'))
     if params:
-      param_str = urllib.parse.urlencode(params, True)
+      param_str = urllib.urlencode(params, True)
       res += '?' + param_str
     return iri_to_uri(res)
 
 
-class HTTPErrorProcessor(urllib.request.HTTPErrorProcessor):
+class HTTPErrorProcessor(urllib2.HTTPErrorProcessor):
   """
   Python 2.4 only recognize 200 and 206 as success. It's broken. So we install
   the following processor to catch the bug.
   """
   def http_response(self, request, response):
     if 200 <= response.code < 300:
       return response
-    return urllib.request.HTTPErrorProcessor.http_response(self, request, response)
+    return urllib2.HTTPErrorProcessor.http_response(self, request, response)
 
   https_response = http_response
 
@@ -214,14 +216,14 @@ def iri_to_uri(iri):
     #     sub-delims  = "!" / "$" / "&" / "'" / "(" / ")"
     #                   / "*" / "+" / "," / ";" / "="
     #     unreserved  = ALPHA / DIGIT / "-" / "." / "_" / "~"
-    # Of the unreserved characters, urllib.parse.quote already considers all but
+    # Of the unreserved characters, urllib.quote already considers all but
     # the ~ safe.
     # The % character is also added to the list of safe characters here, as the
     # end of section 3.1 of RFC 3987 specifically mentions that % must not be
     # converted.
     if iri is None:
         return iri
-    return urllib.parse.quote(smart_str(iri), safe="/#%[]=:;$&()+,!?*@'~")
+    return urllib.quote(smart_str(iri), safe="/#%[]=:;$&()+,!?*@'~")
 
 #
 # Method copied from Django

python/src/cm_api/resource.py

@@ -14,18 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
 try:
   import json
 except ImportError:
   import simplejson as json
 import logging
-import os
 import posixpath
 import time
 import socket
-import six
-from six.moves import urllib
-
 try:
   import socks
   socks_server = os.environ.get("SOCKS_SERVER", None)
@@ -35,6 +32,7 @@
     socket.socket = socks.socksocket
 except ImportError:
   pass
+import urllib2
 
 LOG = logging.getLogger(__name__)
 
@@ -75,7 +73,7 @@ def invoke(self, method, relpath=None, params=None, data=None, headers=None):
                                 headers=headers)
     try:
       body = resp.read()
-    except Exception as ex:
+    except Exception, ex:
       raise Exception("Command '%s %s' failed: %s" %
                       (method, path, ex))
 
@@ -90,7 +88,7 @@ def invoke(self, method, relpath=None, params=None, data=None, headers=None):
       try:
         json_dict = json.loads(body)
         return json_dict
-      except Exception as ex:
+      except Exception, ex:
         self._client.logger.exception('JSON decode error: %s' % (body,))
         raise ex
     else:
@@ -105,12 +103,12 @@ def get(self, relpath=None, params=None):
 
     @return: A dictionary of the JSON result.
     """
-    for retry in six.moves.xrange(self.retries + 1):
+    for retry in xrange(self.retries + 1):
       if retry:
         time.sleep(self.retry_sleep)
       try:
         return self.invoke("GET", relpath, params)
-      except (socket.error, urllib.error.URLError) as e:
+      except (socket.error, urllib2.URLError) as e:
         if "timed out" in str(e).lower():
           log_message = "Timeout issuing GET request for %s." \
               % (self._join_uri(relpath), )

python/src/cm_api_tests/test_baseapiobject.py

@@ -89,7 +89,7 @@ def test_serde(self):
       }
     '''
     obj = utils.deserialize(JSON, Parent)
-    self.assertEqual([], obj.children)
+    self.assertEquals([], obj.children)
 
   def test_init(self):
     obj = Parent(None)
@@ -106,4 +106,4 @@ def test_empty_property(self):
     dummy.foo = 'foo'
     json = dummy.to_json_dict()
     self.assertEqual('foo', json['foo'])
-    self.assertFalse('bar' in json)
+    self.assertFalse(json.has_key('bar'))

python/src/cm_api_tests/test_batch.py

@@ -38,4 +38,4 @@ def test_execute_batch(self):
     self.assertIsInstance(ret, ApiBatchResponseList)
     self.assertIsInstance(ret.success, bool)
     self.assertFalse(ret.success)
-    self.assertEqual(0, len(ret))
+    self.assertEquals(0, len(ret))

python/src/cm_api_tests/test_dashboards.py

@@ -57,7 +57,7 @@ def test_create_dashboards(self):
       data=[dashboard])
 
     resp = create_dashboards(resource, [dashboard])
-    self.assertEqual(1, len(resp))
+    self.assertEquals(1, len(resp))
 
   def test_delete_dashboard(self):
     resource = utils.MockResource(self)

python/src/cm_api_tests/test_impala.py

@@ -34,7 +34,7 @@ def test_get_queries(self):
         params={ 'from':time.isoformat(), 'to':time.isoformat(), \
             'filter':'', 'limit':100, 'offset':0 })
     resp = service.get_impala_queries(time, time)
-    self.assertEqual(0, len(resp.queries))
+    self.assertEquals(0, len(resp.queries))
 
   def test_get_details(self):
     resource = utils.MockResource(self)
@@ -44,7 +44,7 @@ def test_get_details(self):
         retdata={ 'details': '' },
         params={ 'format':'text' } )
     resp = service.get_query_details('randomId')
-    self.assertEqual('', resp.details)
+    self.assertEquals('', resp.details)
 
   def test_cancel_query(self):
     resource = utils.MockResource(self)
@@ -53,7 +53,7 @@ def test_cancel_query(self):
     resource.expect("POST", "/cm/service/impalaQueries/randomId/cancel",
         retdata={ 'warning' : 'test' })
     resp = service.cancel_impala_query('randomId')
-    self.assertEqual('test', resp.warning)
+    self.assertEquals('test', resp.warning)
 
   def test_attributes(self):
     resource = utils.MockResource(self)
@@ -66,7 +66,7 @@ def test_attributes(self):
                   'supportsHistograms' : True,
                   'description' : 'testDescription' }])
     resp = service.get_impala_query_attributes()
-    self.assertEqual(1, len(resp))
+    self.assertEquals(1, len(resp))
     attr = resp[0]
     self.assertIsInstance(attr, ApiImpalaQueryAttribute)
-    self.assertEqual('test', attr.name)
+    self.assertEquals('test', attr.name)