Merge pull request #12 from MeiK2333/master

Support python3

Author: wxbty

README.md

@@ -35,6 +35,7 @@ python-dubbo支持以下Java类型的参数，表格右边一列代表了在Pyto
 | 浮点类型 | float, double | float |
 | 字符串类型 | java.lang.String | str |
 | 列表类型 | Collection & Array | [] |
+| 时间类型 | java.util.Date | datetime |
 | 自定义的对象类型 | java.lang.Object | ↓ _具体使用方法如下所示_ ↓ |
 
 ##### 使用Java的对象类型

dubbo/client.py

@@ -22,7 +22,7 @@
 import threading
 import time
 import random
-from urllib import quote
+from urllib.parse import quote
 
 from kazoo.client import KazooClient
 from kazoo.protocol.states import KazooState
@@ -120,16 +120,17 @@ def __init__(self, hosts, application_name='search_platform'):
         :param hosts: Zookeeper的地址
         :param application_name: 当前客户端的名称
         """
+        self.hosts = {}
+        self.weights = {}
+        self.application_name = application_name
+        self.lock = threading.Lock()
+
         zk = KazooClient(hosts=hosts)
         # 对zookeeper连接状态的监控
         zk.add_listener(self.state_listener)
         zk.start()
 
         self.zk = zk
-        self.hosts = {}
-        self.weights = {}
-        self.application_name = application_name
-        self.lock = threading.Lock()
 
     def state_listener(self, state):
         """
@@ -186,11 +187,11 @@ def _get_providers_from_zk(self, path, interface):
         :return:
         """
         providers = self.zk.get_children(path, watch=self._watch_children)
-        providers = filter(lambda provider: provider['scheme'] == 'dubbo', map(parse_url, providers))
+        providers = list(filter(lambda provider: provider['scheme'] == 'dubbo', list(map(parse_url, providers))))
         if not providers:
             raise RegisterException('no providers for interface {}'.format(interface))
         self._register_consumer(providers)
-        self.hosts[interface] = map(lambda provider: provider['host'], providers)
+        self.hosts[interface] = list(map(lambda provider: provider['host'], providers))
 
     def _get_configurators_from_zk(self, interface):
         """
@@ -200,7 +201,7 @@ def _get_configurators_from_zk(self, interface):
         """
         configurators = self.zk.get_children(DUBBO_ZK_CONFIGURATORS.format(interface), watch=self._watch_configurators)
         if configurators:
-            configurators = map(parse_url, configurators)
+            configurators = list(map(parse_url, configurators))
             conf = {}
             for configurator in configurators:
                 conf[configurator['host']] = configurator['fields'].get('weight', 100)  # 默认100
@@ -217,12 +218,12 @@ def _watch_children(self, event):
         interface = path.split('/')[2]
 
         providers = self.zk.get_children(path, watch=self._watch_children)
-        providers = filter(lambda provider: provider['scheme'] == 'dubbo', map(parse_url, providers))
+        providers = list(filter(lambda provider: provider['scheme'] == 'dubbo', list(map(parse_url, providers))))
         if not providers:
             logger.debug('no providers for interface {}'.format(interface))
             self.hosts[interface] = []
             return
-        self.hosts[interface] = map(lambda provider: provider['host'], providers)
+        self.hosts[interface] = list(map(lambda provider: provider['host'], providers))
         logger.debug('{} providers: {}'.format(interface, self.hosts[interface]))
 
     def _watch_configurators(self, event):
@@ -239,7 +240,7 @@ def _watch_configurators(self, event):
         configurators = self.zk.get_children(DUBBO_ZK_CONFIGURATORS.format(interface),
                                              watch=self._watch_configurators)
         if configurators:
-            configurators = map(parse_url, configurators)
+            configurators = list(map(parse_url, configurators))
             conf = {}
             for configurator in configurators:
                 conf[configurator['host']] = configurator['fields'].get('weight', 100)
@@ -303,7 +304,7 @@ def _routing_with_wight(self, interface):
             hosts_weight.append(int(weights.get(host, 100)))
 
         hit = random.randint(0, sum(hosts_weight) - 1)
-        for i in xrange(len(hosts)):
+        for i in range(len(hosts)):
             if hit <= sum(hosts_weight[:i + 1]):
                 return hosts[i]
 

dubbo/codec/decoder.py

@@ -185,20 +185,20 @@ def _read_utf(self, length):
         :return:
         """
         value = u''
-        for i in xrange(length):
+        for i in range(length):
             ch = self.read_byte()
             if ch < 0x80:
-                value += unichr(ch)
+                value += chr(ch)
             elif (ch & 0xe0) == 0xc0:
                 ch1 = self.read_byte()
-                value += unichr(((ch & 0x1f) << 6) + (ch1 & 0x3f))
+                value += chr(((ch & 0x1f) << 6) + (ch1 & 0x3f))
             elif (ch & 0xf0) == 0xe0:
                 ch1 = self.read_byte()
                 ch2 = self.read_byte()
-                value += unichr(((ch & 0x0f) << 12) + ((ch1 & 0x3f) << 6) + (ch2 & 0x3f))
+                value += chr(((ch & 0x0f) << 12) + ((ch1 & 0x3f) << 6) + (ch2 & 0x3f))
             else:
                 raise ValueError('Can\'t parse utf-8 char {}'.format(ch))
-        return value.encode('utf-8')  # 将unicode转化为str类型
+        return value
 
     @ranges((0x00, 0x1f), (0x30, 0x33), 0x52, ord('S'))
     def read_string(self):
@@ -263,7 +263,7 @@ def read_class(self):
 
         field_length = self.read_int()
         field_names = []
-        for i in xrange(field_length):
+        for i in range(field_length):
             field_names.append(self.read_string())
         self.field_names.append(field_names)
         return self.read_object()
@@ -295,23 +295,23 @@ def read_list(self):
         if 0x70 <= value <= 0x77:
             _type = self.read_type()  # type对于Python来说没有用处
             length = value - 0x70
-            for i in xrange(length):
+            for i in range(length):
                 result.append(self.read_next())
         # 固定长度的无类型短小列表
         elif 0x78 <= value <= 0x7f:
             length = value - 0x78
-            for i in xrange(length):
+            for i in range(length):
                 result.append(self.read_next())
         # 固定长度的有类型列表
         elif value == 0x56:
             _type = self.read_type()
             length = self.read_int()
-            for i in xrange(length):
+            for i in range(length):
                 result.append(self.read_next())
         # 固定长度的无类型列表
         elif value == 0x58:
             length = self.read_int()
-            for i in xrange(length):
+            for i in range(length):
                 result.append(self.read_next())
         # 可变长度的有类型列表
         elif value == 0x55:
@@ -423,7 +423,7 @@ def read_error(self):
 
         field_length = self.read_int()
         field_names = []
-        for i in xrange(field_length):
+        for i in range(field_length):
             field_names.append(self.read_string())
         self.field_names.append(field_names)
 

dubbo/codec/encoder.py

@@ -30,6 +30,7 @@
 * java.lang.Object
 """
 import struct
+from datetime import datetime
 
 from dubbo.common.constants import MIN_INT_32, MAX_INT_32, DEFAULT_REQUEST_META
 from dubbo.common.exceptions import HessianTypeError
@@ -46,7 +47,7 @@ def __init__(self, path, values=None):
         :param path:   Java对象的路径，例如：java.lang.Object
         :param values: 可以在创建对象时就进行赋值
         """
-        if not isinstance(path, (str, unicode)):
+        if not isinstance(path, str):
             raise ValueError('Object path {} should be string type.'.format(path))
         self.__path = path
         if not isinstance(values, dict):
@@ -57,7 +58,7 @@ def __getitem__(self, key):
         return self.__values[key]
 
     def __setitem__(self, key, value):
-        if not isinstance(key, (str, unicode)):
+        if not isinstance(key, str):
             raise ValueError('Object key {} should be string type.'.format(key))
         self.__values[key] = value
 
@@ -133,8 +134,10 @@ def _get_class_name(self, _class):
                 return 'J'
         elif isinstance(_class, float):
             return 'D'
-        elif isinstance(_class, (str, unicode)):
+        elif isinstance(_class, str):
             return 'L' + 'java/lang/String' + ';'
+        elif isinstance(_class, datetime):
+            return 'Ljava/util/Date;'
         elif isinstance(_class, Object):
             path = _class.get_path()
             path = 'L' + path.replace('.', '/') + ';'
@@ -180,7 +183,7 @@ def _encode_request_body(self):
         body.append(ord('Z'))
 
         # 因为在上面的逻辑中没有对byte大小进行检测，所以在这里进行统一的处理
-        for i in xrange(len(body)):
+        for i in range(len(body)):
             body[i] = body[i] & 0xff
         return body
 
@@ -277,6 +280,21 @@ def _encode_float(value):
         result.append(bits)
         return result
 
+    @staticmethod
+    def _encode_datetime(value):
+        result = []
+        result.append(0x4a)
+        value = int(value.timestamp() * 1000)
+        result.append(value >> 56)
+        result.append(value >> 48)
+        result.append(value >> 40)
+        result.append(value >> 32)
+        result.append(value >> 24)
+        result.append(value >> 16)
+        result.append(value >> 8)
+        result.append(value)
+        return result
+
     @staticmethod
     def _encode_utf(value):
         """
@@ -308,7 +326,7 @@ def _encode_str(self, value):
         result = []
         # 在进行网络传输操作时一律使用unicode进行操作
         if isinstance(value, str):
-            value = value.decode('utf-8')
+            value = value
         length = len(value)
         if length <= 0x1f:
             result.append(0x00 + length)
@@ -415,8 +433,10 @@ def _encode_single_value(self, value):
         elif isinstance(value, float):
             return self._encode_float(value)
         # 字符串类型
-        elif isinstance(value, (str, unicode)):
+        elif isinstance(value, str):
             return self._encode_str(value)
+        elif isinstance(value, datetime):
+            return self._encode_datetime(value)
         # 对象类型
         elif isinstance(value, Object):
             return self._encode_object(value)

dubbo/common/util.py

@@ -23,7 +23,7 @@
 import struct
 import threading
 from sys import platform, maxsize
-from urlparse import urlparse, unquote, parse_qsl
+from urllib.parse import urlparse, unquote, parse_qsl
 
 import logging
 

requirements.txt

@@ -1 +1 @@
-kazoo==2.4.0
+kazoo==2.6.0

setup.py

@@ -37,6 +37,6 @@
         'Programming Language :: Python :: 2.7',
     ],
     install_requires=[
-        'kazoo==2.4.0'
+        'kazoo==2.6.0'
     ],
 )

tests/dubbo_test.py

@@ -129,13 +129,13 @@ def _run_num(self):
 
     # @unittest.skip('skip performance test')
     def test_multi_threading(self):
-        for i in xrange(10):
+        for i in range(10):
             thread = threading.Thread(target=self._run_num)
             thread.start()
 
     # @unittest.skip('skip performance test')
     def test_performance(self):
-        for i in xrange(10):
+        for i in range(10):
             self.dubbo.call('echo18')
 
     def test_auto_rule(self):
@@ -265,15 +265,15 @@ def test_pc(self):
         result = spu_query_provider.call('query', spu_query_request)
         # pretty_print(result)
         total = result['totalCount']
-        print total
-        print len(result['dataList'])
+        print(total)
+        print(len(result['dataList']))
 
         data_list = result['dataList']
         for data in data_list:
             spu_id = data['spuId']
             spu_desc_request = Object('com.qianmi.pc.item.api.spu.request.SpuDescriptionGetRequest')
             spu_desc_request['spuId'] = spu_id
-            print spu_id
+            print(spu_id)
             spu_desc_request['chainMasterId'] = 'A000000'
             pretty_print(spu_query_provider.call('getDescription', spu_desc_request))
 

tests/run_test.py

@@ -49,17 +49,17 @@ def test_run_default(self):
     def test_run(self):
         zk = ZkRegister('127.0.0.1:2181')
         dubbo_cli = DubboClient('me.hourui.echo.provider.Echo', zk_register=zk)
-        for i in xrange(4):
+        for i in range(4):
             thread = threading.Thread(target=run, args=(dubbo_cli,))
             thread.start()
 
 
 def pretty_print(value):
-    print json.dumps(value, ensure_ascii=False, indent=4, sort_keys=True)
+    print(json.dumps(value, ensure_ascii=False, indent=4, sort_keys=True))
 
 
 def run(_dubbo):
-    for j in xrange(1000):
+    for j in range(1000):
         _dubbo.call('echo18')