Merge pull request #7 from sundeep-co-in/port

backport: python 2.6 support

Author: sdp5

.travis.yml

@@ -1,7 +1,8 @@
 language: python
 python:
+  - "2.6"
   - "2.7"
 # command to install dependencies
-install: "pip install -r requirements.txt"
+install: "pip install -r requirements-dev.txt"
 # command to run tests
 script: make flake8 test

CHANGELOG

@@ -1,3 +1,6 @@
+* Wed Jan 20 2016 Sundeep Anand <suanand@redhat.com> - 1.4.2
+- Python 2.6 Support
+
 * Tue Jan 12 2016 Sundeep Anand <suanand@redhat.com> - 1.4.1
 - Implemented zanata init (ZNTA-780)
 - Bug ZNTA-853 - Crash when pushing local translations

Makefile

@@ -26,7 +26,7 @@ lint-report:
 	pylint --reports=n zanata zanataclient
 
 flake8:
-	flake8 --ignore=E501,F403,W601,F841,F401,E711,E712 zanataclient test
+	flake8 --ignore=E501,F403,F841,F401 zanataclient test
 
 test:
 	(cd test; python test_all.py)

requirements-dev.txt

@@ -0,0 +1,13 @@
+-r requirements.txt
+flake8==2.4.1
+funcsigs==0.4
+linecache2==1.0.0
+mccabe==0.3.1
+MiniMock==1.2.8
+mock==1.3.0
+pbr==1.8.1
+pep8==1.5.7
+pyflakes==0.8.1
+six==1.10.0
+traceback2==1.4.0
+unittest2==1.1.0

requirements.txt

@@ -1,12 +1,3 @@
-flake8==2.4.1
-funcsigs==0.4
-httplib2==0.9.2
-ipdb==0.8.1
-mccabe==0.3.1
-MiniMock==1.2.8
-mock==1.3.0
-pbr==1.8.1
-pep8==1.5.7
-polib==1.0.7
-pyflakes==0.8.1
-six==1.10.0
+httplib2
+polib
+ordereddict

setup.py

@@ -3,11 +3,15 @@
 Build script for zanata-python-client
 """
 from setuptools import setup, find_packages
-import sys
 import os
 import subprocess
 
 
+def read(fname):
+    return (open(os.path.join(os.path.dirname(__file__), fname), 'rb')
+            .read().decode('utf-8'))
+
+
 def get_client_version():
     number = ""
     path = os.path.dirname(os.path.realpath(__file__))
@@ -41,18 +45,16 @@ def get_client_version():
 
     return number
 
-assert sys.version_info >= (2, 7), (
-    "Only Python 2.7 and later is supported by zanata-python-client.")
+requirements = read('requirements.txt').splitlines() + [
+    'setuptools',
+]
 
 setup(
     name="zanata-python-client",
     version=get_client_version(),
     packages=find_packages(),
     include_package_data=True,
-    install_requires=[
-        'polib',
-        'httplib2'
-    ],
+    install_requires=requirements,
     description="Zanata Python Client.",
     author='Jian Ni, Ding-Yi Chen, Anish Patil',
     author_email='jni@redhat.com, dchen@redhat.com, apatil@redhat.com',
@@ -81,6 +83,7 @@ def get_client_version():
         'License :: OSI Approved :: GNU Lesser General Public License (LGPL)',
         'Operating System :: Unix',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
     ],
 )

test/test_context.py

@@ -71,8 +71,11 @@ def setUp(self):
         self.init_context = ProjectContext(command_options, 'init')
 
     def test_command_options(self):
-        command_options_keys = ['project_type', 'comment_cols', 'user_config', 'project_config']
-        self.assertEqual(self.context.command_options.keys(), command_options_keys)
+        command_options_keys = ['project_type', 'project_config', 'comment_cols', 'user_config']
+        self.assertTrue(list(self.context.command_options.keys())[0] in command_options_keys)
+        self.assertTrue(list(self.context.command_options.keys())[1] in command_options_keys)
+        self.assertTrue(list(self.context.command_options.keys())[2] in command_options_keys)
+        self.assertTrue(list(self.context.command_options.keys())[3] in command_options_keys)
         self.assertEqual(
             self.context.command_dict,
             {'project_config': './testfiles/zanata.xml', 'comment_cols': 'en-US,es,pos,description',
@@ -94,8 +97,8 @@ def test_build_local_config(self):
             self.context.local_config['http_headers'],
             {'Accept': 'application/json', 'X-Auth-User': 'username', 'X-Auth-Token': 'key'}
         )
-        self.assertIn('client_version', self.context.local_config,
-                      'local_config should contain client_version')
+        self.assertTrue('client_version' in self.context.local_config,
+                        'local_config should contain client_version')
 
     @mock.patch('zanataclient.zanatalib.projectservice.LocaleService.get_locales')
     @mock.patch('zanataclient.zanatalib.versionservice.VersionService.get_server_version')
@@ -163,8 +166,8 @@ def test_process_locales(self):
 
     def test_init_context(self):
         context_data = self.init_context.get_context_data()
-        self.assertIn('servers', context_data)
-        self.assertIn('http://localhost:8080/zanata', context_data['servers'])
+        self.assertTrue('servers' in context_data)
+        self.assertTrue('http://localhost:8080/zanata' in context_data['servers'])
 
 if __name__ == '__main__':
     unittest.main()

test/test_parseconfig.py

@@ -41,7 +41,7 @@ def test_user_config(self):
         user_name = self.config.get_config_value("username", 'servers', server)
         apikey = self.config.get_config_value("key", 'servers', server)
         servers = self.config.get_servers()
-        self.assertIn('http://localhost:8080/zanata', servers)
+        self.assertTrue('http://localhost:8080/zanata' in servers)
         self.assertEqual(server, "local")
         self.assertEqual(user_name, "username")
         self.assertEqual(apikey, "key")

test/test_service.py

@@ -23,11 +23,14 @@
     "ServiceTest",
 )
 
-import unittest
 import sys
 import os
 sys.path.insert(0, os.path.abspath(__file__ + "/../.."))
 from zanataclient.zanatalib.service import Service
+if sys.version_info < (2, 7):
+    import unittest2 as unittest
+else:
+    import unittest
 
 
 # test data
@@ -66,6 +69,10 @@ def test_messages_status_201(self):
         result_set = self.service.messages(SERVICE_RESPONSE_201, RESPONSE_CONTENT)
         self.assertTrue(result_set)
 
+    @unittest.skipIf(
+        sys.version_info < (2, 7),
+        'https://docs.python.org/2/library/unittest.html#unittest.TestCase.assertRaises'
+    )
     def test_messages_status_401_503(self):
         with self.assertRaises(SystemExit):
             self.service.messages(SERVICE_RESPONSE_401, RESPONSE_CONTENT)

zanataclient/__init__.py

@@ -20,6 +20,6 @@
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA  02110-1301, USA.
 
-from parseconfig import *
-from publicanutil import *
-from zanata import *
+from .parseconfig import *
+from .publicanutil import *
+from .zanata import *