Revert "[python] Additional changes for python3 compatibility"

This reverts commit 5266328.
abryko · Apr 9, 2015 · 27499aa · 27499aa
1 parent e7d37ab
commit 27499aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/python/setup.py b/python/setup.py
@@ -20,9 +20,9 @@
 from sys import version_info, platform
 
 if version_info[:2] > (2, 5):
-    install_requires = ['six']
+    install_requires = []
 else:
-    install_requires = ['six', 'simplejson >= 2.0.0']
+    install_requires = ['simplejson >= 2.0.0']
 
 # Python 2.6 and below requires argparse
 if version_info[:2] < (2, 7):
@@ -60,7 +60,6 @@
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.3",
   ],
   entry_points = { 'console_scripts': [ 'cmps = cm_shell.cmps:main', ]}
 )
diff --git a/python/src/cm_api_tests/test_replication.py b/python/src/cm_api_tests/test_replication.py
@@ -66,7 +66,7 @@ def test_hdfs_arguments(self):
     self.assertFalse(args.preservePermissions)
     self.assertTrue(args.preserveReplicationCount)
     self.assertFalse(args.skipTrash)
-    self.assertEqual('DYNAMIC', args.replicationStrategy)
+    self.assertEquals('DYNAMIC', args.replicationStrategy)
     self.assertFalse(args.preserveXAttrs)
 
   def test_hive_arguments(self):