Merge branch 'release/3.1'

Author: Anmol-Gulati

magento/api.py

@@ -6,12 +6,12 @@
 
     :license: BSD, see LICENSE for more details
 '''
-import sys
+import six
 from threading import RLock
 
 PROTOCOLS = []
 try:
-    if sys.version_info < (3, 0):
+    if six.PY2:
         from xmlrpclib import ServerProxy
     else:
         from xmlrpc.client import ServerProxy
@@ -57,11 +57,11 @@ def __new__(meta, name, bases, dct):
         return Klass
 
 
+@six.add_metaclass(ClientApiMeta)
 class API(object):
     """
     Generic API to connect to magento
     """
-    __metaclass__ = ClientApiMeta
     __abstract__ = True
 
     def __init__(self, url, username, password,

magento/version.py

@@ -6,4 +6,4 @@
     installing the module
 
 """
-VERSION = '3.0'
+VERSION = '3.1'

setup.py

@@ -25,6 +25,7 @@
     platforms='any',
     install_requires=[
         'suds-jurko>=0.6',
+        'six',
     ],
     classifiers=[
         'Development Status :: 6 - Mature',