Skip to content

Commit

Permalink
fix the pypy3 beta tricky issue
Browse files Browse the repository at this point in the history
  • Loading branch information
wjo1212 committed Nov 22, 2017
1 parent bf1ebca commit a80f36d
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
5 changes: 1 addition & 4 deletions aliyunlogcli/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@

__version__ = '0.1.0'
from aliyun.log.version import USER_AGENT as SDK_USER_AGENT
USER_AGENT = 'log-cli-v-' + __version__ + ", " + SDK_USER_AGENT
from .version import __version__
2 changes: 1 addition & 1 deletion aliyunlogcli/cli.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

from jmespath.exceptions import ParseError
from parser import *
from __init__ import __version__, USER_AGENT
from version import __version__, USER_AGENT
from aliyun.log import LogException, LogClient
import six.moves.configparser as configparser
from docopt import docopt
Expand Down
5 changes: 4 additions & 1 deletion aliyunlogcli/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,10 @@ def _attach_more_cmd():
return cmd


def parse_method_types_optdoc_from_class(cls, black_list=(r'^_.+',)):
def parse_method_types_optdoc_from_class(cls, black_list=None):
if black_list is None:
black_list = (r'^_.+',)

method_list = []
for k in dir(cls):
m = getattr(cls, k, None)
Expand Down
4 changes: 4 additions & 0 deletions aliyunlogcli/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

__version__ = '0.1.0'
from aliyun.log.version import USER_AGENT as SDK_USER_AGENT
USER_AGENT = 'log-cli-v-' + __version__ + ", " + SDK_USER_AGENT
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
#
# The short X.Y version.
version = '0.6'
with open(os.path.abspath('../../aliyunlogcli/__init__.py'), 'r') as fd:
with open(os.path.abspath('../../aliyunlogcli/version.py'), 'r') as fd:
version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
fd.read(), re.MULTILINE).group(1)

Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
'aliyunlogcli'
]

version = ''
with open('aliyunlogcli/__init__.py', 'r') as fd:
version = '0.1'
with open('aliyunlogcli/version.py', 'r') as fd:
version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
fd.read(), re.MULTILINE).group(1)

Expand Down

0 comments on commit a80f36d

Please sign in to comment.