diff options
author | Timothy Crosley <timothy.crosley@gmail.com> | 2013-12-22 18:30:49 -0500 |
---|---|---|
committer | Timothy Crosley <timothy.crosley@gmail.com> | 2013-12-22 18:30:49 -0500 |
commit | 8b784550039dc72eda8a2a8177e39cca4f5add54 (patch) | |
tree | 27b24d5635be7df6a8d7c9a2f6374d34de681211 | |
parent | 462014b7e0e3e3976530ed1329fd034dc78f40f8 (diff) | |
parent | 8ccc4feb968dddb23cffba1f3bd2795dcf1c91f6 (diff) | |
download | pies-8b784550039dc72eda8a2a8177e39cca4f5add54.tar.gz |
Merge branch 'release/2.5.1'2.5.1
-rw-r--r-- | pies/__init__.py | 2 | ||||
-rw-r--r-- | pies/ast.py | 18 | ||||
-rw-r--r-- | pies2overrides/setup.py | 4 | ||||
-rw-r--r-- | setup.py | 4 |
4 files changed, 23 insertions, 5 deletions
diff --git a/pies/__init__.py b/pies/__init__.py index 313d8e0..af47d20 100644 --- a/pies/__init__.py +++ b/pies/__init__.py @@ -29,4 +29,4 @@ OTHER DEALINGS IN THE SOFTWARE. """ -__version__ = "2.5.0" +__version__ = "2.5.1" diff --git a/pies/ast.py b/pies/ast.py index 43739a1..3821960 100644 --- a/pies/ast.py +++ b/pies/ast.py @@ -6,5 +6,23 @@ from .version_info import PY2 if PY2: Try = TryExcept + + def argument_names(node): + return [isinstance(arg, Name) and arg.id or None for arg in node.args.args] + + def kw_only_argument_names(node): + return [] + + def kw_only_default_count(node): + return 0 else: TryFinally = () + + def argument_names(node): + return [arg.arg for arg in node.args.args] + + def kw_only_argument_names(self): + return [arg.arg for arg in node.args.kwonlyargs] + + def kw_only_default_count(self): + return sum(1 for n in node.args.kw_defaults if n is not None) diff --git a/pies2overrides/setup.py b/pies2overrides/setup.py index 5cf5aff..ba01db5 100644 --- a/pies2overrides/setup.py +++ b/pies2overrides/setup.py @@ -14,12 +14,12 @@ if sys.version_info[0] == 2 and sys.version_info[1] < 7: install_requires += ['ordereddict', 'argparse'] setup(name='pies2overrides', - version='2.5.0', + version='2.5.1', description='Defines override classes that should be included with pies only if running on Python2.', author='Timothy Crosley', author_email='timothy.crosley@gmail.com', url='https://github.com/timothycrosley/pies', - download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-2.5.0.tar.gz?raw=true', + download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-2.5.1.tar.gz?raw=true', license="MIT", install_requires=install_requires, requires=install_requires, @@ -24,13 +24,13 @@ except (IOError, ImportError, OSError, RuntimeError): readme = '' setup(name='pies', - version='2.5.0', + version='2.5.1', description='The simplest way to write one program that runs on both Python 2 and Python 3.', long_description=readme, author='Timothy Crosley', author_email='timothy.crosley@gmail.com', url='https://github.com/timothycrosley/pies', - download_url='https://github.com/timothycrosley/pies/blob/master/dist/pies-2.5.0.tar.gz?raw=true', + download_url='https://github.com/timothycrosley/pies/blob/master/dist/pies-2.5.1.tar.gz?raw=true', license="MIT", install_requires=install_requires, requires=install_requires, |