From 27499aacc838240f4c462576c2ec34219e8404d9 Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Thu, 9 Apr 2015 11:19:10 -0700 Subject: [PATCH] Revert "[python] Additional changes for python3 compatibility" This reverts commit 5266328de739b5a8cb85ed658d378c3fafe081b5. --- python/setup.py | 5 ++--- python/src/cm_api_tests/test_replication.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/python/setup.py b/python/setup.py index ebf0a0e7..489dbf89 100644 --- 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 index 700064f9..5ba5b9e4 100644 --- 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):