talos-python 3.1.0__tar.gz → 3.1.2__tar.gz

{talos-python-3.1.0/talos_python.egg-info → talos_python-3.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
-Name: talos-python
-Version: 3.1.0
+Name: talos_python
+Version: 3.1.2
 Summary: talos python2 sdk
 Home-page: UNKNOWN
 Author: huyumei

{talos-python-3.1.0 → talos_python-3.1.2}/setup.py

@@ -1,8 +1,8 @@
 from setuptools import find_packages, setup
 
 setup(
-    name='talos-python',
-    version='3.1.0',
+    name='talos_python',
+    version='3.1.2',
     author='huyumei',
     author_email='huyumei@xiaomi.com',
     maintainer='fangchengjin',

talos_python-3.1.2/talos/client/ClientVersion.py

@@ -0,0 +1,24 @@
+try:
+    import pkg_resources
+except ImportError:
+    pkg_resources = None
+
+_CLIENT_VERSION = None
+
+def _init_version():
+    global _CLIENT_VERSION
+
+    if not pkg_resources:
+        return
+
+    default_version = "0.0.0"
+
+    try:
+        _CLIENT_VERSION = pkg_resources.get_distribution("talos-python").version
+    except (ImportError, pkg_resources.DistributionNotFound):
+        _CLIENT_VERSION = default_version
+
+_init_version()
+
+def get_client_version():
+    return _CLIENT_VERSION

{talos-python-3.1.0 → talos_python-3.1.2}/talos/client/TalosClientFactory.py

@@ -15,6 +15,7 @@ from talos.client.TalosErrors import InvalidArgumentError
 from talos.client.Constants import Constants
 from talos.thrift.protocol.TCompactProtocol import TCompactProtocol
 from talos.client.TalosHttpClient import TalosHttpClient
+from talos.client import ClientVersion
 import threading
 import logging
 import platform
@@ -410,6 +411,6 @@ class TalosClientFactory:
             raise InvalidArgumentError("Credential is not set")
 
     def create_user_agent_header(self):
-        return "Python-SDK/" + str(self._version.major) + "." + str(self._version.minor) + "." + str(self._version.revision) + " Python/" + platform.python_version()
+        return "Python-SDK/" + ClientVersion.get_client_version() + " Python/" + platform.python_version()
 
 

{talos-python-3.1.0 → talos_python-3.1.2}/talos/client/TalosHttpClient.py

@@ -407,7 +407,7 @@ class TalosHttpClient(TTransportBase):
         response = self.__http_response
         if not self.code == 200:
             isTalosTransportError = True
-            headers = response.headers._headers
+            headers = response.getheaders()
             for i in headers:
                 if i[0] == 'Content-Type':
                     isTalosTransportError = False
@@ -427,17 +427,17 @@ class TalosHttpClient(TTransportBase):
     # @ return if clock is adjusted
     def adjustClock(self, response, httpStatusCode):
         if httpStatusCode == HttpStatusCode.CLOCK_TOO_SKEWED:
-            headers = response.heasers(constants.HK_TIMESTAMP)
-            for key, hv in headers.items():
+            hv = response.getheader(constants.HK_TIMESTAMP)
+            if hv is not None:
                 serverTime = int(hv)
-                min = 60 * 60 * 24 * 365 * (2010 - 1970)
-                max = 60 * 60 * 24 * 365 * (2030 - 1970)
-            if serverTime > min and serverTime < max:
-                self.logger.debug("Adjusting client time from {} to {}" +
-                                  str(self._clockOffset) + " serverTime: " + str(
-                    serverTime))
-                self._clockOffset = serverTime
-                return True
+                minTime = 60 * 60 * 24 * 365 * (2010 - 1970)
+                maxTime = 60 * 60 * 24 * 365 * (2030 - 1970)
+                if minTime < serverTime < maxTime:
+                    self.logger.debug("Adjusting client time from {} to {}" +
+                                      str(self._clockOffset) + " serverTime: " + str(
+                        serverTime))
+                    self._clockOffset = serverTime
+                    return True
         return False
 
 

{talos-python-3.1.0 → talos_python-3.1.2}/talos/consumer/PartitionFetcher.py

@@ -282,7 +282,7 @@ class PartitionFetcher(object):
         # get the successfully locked partition
         successPartitionList = lockResponse.successPartitions
         if len(successPartitionList) > 0:
-            try
+            try:
                 assert successPartitionList[0] == self.partitionId
             except AssertionError as e:
                 raise e

{talos-python-3.1.0 → talos_python-3.1.2}/talos/consumer/TalosMessageReader.py

@@ -144,7 +144,7 @@ class TalosMessageReader(MessageReader, MessageCheckpointer):
         self.logger.info("start checkpoint: " + str(messageOffset))
         if self.consumerConfig.is_checkpoint_auto_commit():
             self.logger.info("You can not checkpoint through MessageCheckpointer when you set " +
-                             "\"galaxy.talos.consumer.checkpoint.message.offset\" as \"true\"")
+                             "\"galaxy.talos.consumer.checkpoint.auto.commit\" as \"true\"")
             return False
 
         if messageOffset <= self.lastCommitOffset or messageOffset > self.finishedOffset:
@@ -202,7 +202,7 @@ class TalosMessageReader(MessageReader, MessageCheckpointer):
         self.logger.info("start checkpoint: " + str(commitOffset))
         if self.consumerConfig.is_checkpoint_auto_commit():
             self.logger.info("You can not checkpoint through MessageCheckpointer when you set " +
-                             "\"galaxy.talos.consumer.checkpoint.message.offset\" as \"true\"")
+                             "\"galaxy.talos.consumer.checkpoint.auto.commit\" as \"true\"")
             return False
 
         if commitOffset <= self.lastCommitOffset or commitOffset > self.finishedOffset:

{talos-python-3.1.0 → talos_python-3.1.2/talos_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: talos-python
-Version: 3.1.0
+Version: 3.1.2
 Summary: talos python2 sdk
 Home-page: UNKNOWN
 Author: huyumei

{talos-python-3.1.0 → talos_python-3.1.2}/talos_python.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ setup.py
 talos/__init__.py
 talos/admin/TalosAdmin.py
 talos/admin/__init__.py
+talos/client/ClientVersion.py
 talos/client/Constants.py
 talos/client/ScheduleInfoCache.py
 talos/client/SimpleAbnormalCallback.py