Merge branch 'master' of https://github.com/aliyun/aliyun-log-python-sdk

aliyun · Aug 15, 2018 · 22d3bf6 · 22d3bf6
2 parents f6baf08 + 14f25f5
commit 22d3bf6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
   - "pypy"
   - "pypy3"
 

diff --git a/README.md b/README.md
@@ -38,8 +38,9 @@ Don't want to write code? Try the [CLI](http://aliyun-log-cli.readthedocs.io/en/
 4. Python 3.4
 5. Python 3.5
 6. Python 3.6
-7. Pypy2
-8. Pypy3
+7. Python 3.7
+8. Pypy2
+9. Pypy3
 
 ### Supported Log Service API
 1. Log Service API 0.6

diff --git a/README_CN.md b/README_CN.md
@@ -40,8 +40,9 @@
 4. Python 3.4
 5. Python 3.5
 6. Python 3.6
-7. Pypy2
-8. Pypy3
+7. Python 3.7
+8. Pypy2
+9. Pypy3
 
 
 ### 支持API版本

diff --git a/aliyun/log/logclient.py b/aliyun/log/logclient.py
@@ -16,6 +16,7 @@
 import time
 import zlib
 from datetime import datetime
+import locale
 
 from .acl_response import *
 from .consumer_group_request import *
@@ -53,6 +54,8 @@
 DEFAULT_QUERY_RETRY_COUNT = 10
 DEFAULT_QUERY_RETRY_INTERVAL = 0.2
 
+locale.setlocale(locale.LC_ALL, str('en_US.UTF-8'))
+
 
 def _apply_cn_keys_patch():
     """

diff --git a/setup.py b/setup.py
@@ -59,6 +59,7 @@
             'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
             'Programming Language :: Python :: Implementation :: PyPy'
     ]
 

diff --git a/tox.ini b/tox.ini
@@ -13,6 +13,9 @@ deps = -rrequirements-py3.txt
 [testenv:py36]
 deps = -rrequirements-py3.txt
 
+[testenv:py37]
+deps = -rrequirements-py3.txt
+
 [testenv:pypy3]
 deps = -rrequirements-py3.txt