Support both python 2 and python 3

Author: sinall

examples/joinquant/simple_runner.py

@@ -1,9 +1,16 @@
 # -*- coding: utf-8 -*-
 
-import ConfigParser
 import logging
 import os
 
+import six
+from six.moves import configparser
+
+if six.PY2:
+    ConfigParser = configparser.RawConfigParser
+else:
+    ConfigParser = configparser.ConfigParser
+
 from shipane_sdk import Client
 from shipane_sdk.joinquant.client import JoinQuantClient
 from shipane_sdk.joinquant.runner import JoinQuantRunner
@@ -13,7 +20,7 @@
 
     dir_path = os.path.dirname(os.path.realpath(__file__))
 
-    config = ConfigParser.RawConfigParser()
+    config = ConfigParser()
     config.read('{}/config/config.ini'.format(dir_path))
 
     shipane_client = Client(host=config.get('ShiPanE', 'host'),

shipane_sdk/client.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
 import copy
-import urllib
 
 import requests
+from six.moves.urllib.parse import urlencode
 
 
 class Client(object):
@@ -104,7 +104,7 @@ def __create_url(self, resource, resource_id=None, **params):
         else:
             path = '/{}/{}'.format(resource, resource_id)
 
-        return '{}{}?{}'.format(self.__create_base_url(), path, urllib.urlencode(all_params))
+        return '{}{}?{}'.format(self.__create_base_url(), path, urlencode(all_params))
 
     def __create_base_url(self):
         return 'http://' + self._host + ':' + str(self._port)

shipane_sdk/joinquant/executor.py

@@ -52,7 +52,7 @@ def execute(self, order):
                 self._order_id_map[order.order_id] = response.json()['id'];
 
             return response
-        except Exception, e:
+        except Exception as e:
             self._log.error("[实盘易] 下单异常：" + str(e))
 
     def cancel(self, order):
@@ -66,5 +66,5 @@ def cancel(self, order):
                 return self._client.cancel(self._order_id_map[order_id])
             else:
                 self._log.warn('[实盘易] 未找到对应的委托编号')
-        except Exception, e:
+        except Exception as e:
             self._log.error("[实盘易] 撤单异常：" + str(e))

shipane_sdk/joinquant/runner.py

@@ -51,7 +51,7 @@ def run(self):
                         self._log.info(u'实盘易回复：\nstatus_code: %d\ntext: %s', response.status_code, response.text)
                     else:
                         self._log.error('实盘易未回复')
-            except Exception, e:
+            except Exception as e:
                 self._log.error("跟单异常：" + str(e))
 
             self._log.info("********** 结束跟单 **********\n")

tests/shipane_sdk/joinquant/test_client.py

@@ -1,15 +1,22 @@
 # -*- coding: utf-8 -*-
 
-import ConfigParser
 import os
 import unittest
 
+import six
+from six.moves import configparser
+
+if six.PY2:
+    ConfigParser = configparser.RawConfigParser
+else:
+    ConfigParser = configparser.ConfigParser
+
 from shipane_sdk.joinquant.client import JoinQuantClient
 
 
 class JoinQuantClientTest(unittest.TestCase):
     def setUp(self):
-        config = ConfigParser.RawConfigParser()
+        config = ConfigParser()
         dir_path = os.path.dirname(os.path.realpath(__file__))
         config.read('{}/../../config/config.ini'.format(dir_path))
         self._jqClient = JoinQuantClient(username=config.get('JoinQuant', 'username'),

tests/shipane_sdk/joinquant/test_executor.py

@@ -1,20 +1,27 @@
 # -*- coding: utf-8 -*-
 
-import ConfigParser
 import collections
 import inspect
 import logging
 import os
 import unittest
 
+import six
+from six.moves import configparser
+
+if six.PY2:
+    ConfigParser = configparser.RawConfigParser
+else:
+    ConfigParser = configparser.ConfigParser
+
 from shipane_sdk import JoinQuantExecutor
 
 
 class JoinQuantExecutorTest(unittest.TestCase):
     def setUp(self):
         logging.basicConfig(level=logging.INFO)
 
-        config = ConfigParser.RawConfigParser()
+        config = ConfigParser()
         dir_path = os.path.dirname(os.path.realpath(__file__))
         config.read('{}/../../config/config.ini'.format(dir_path))
         self.Order = collections.namedtuple('Order', ['is_buy', 'security', 'price', 'amount'])

tests/shipane_sdk/test_client.py

@@ -1,16 +1,23 @@
 # -*- coding: utf-8 -*-
 
-import ConfigParser
 import inspect
 import os
 import unittest
 
+import six
+from six.moves import configparser
+
+if six.PY2:
+    ConfigParser = configparser.RawConfigParser
+else:
+    ConfigParser = configparser.ConfigParser
+
 from shipane_sdk import Client
 
 
 class ClientTest(unittest.TestCase):
     def setUp(self):
-        config = ConfigParser.RawConfigParser()
+        config = ConfigParser()
         dir_path = os.path.dirname(os.path.realpath(__file__))
         config.read('{}/../config/config.ini'.format(dir_path))
         self.client = Client(host=config.get('ShiPanE', 'host'))