diff options
author | Timothy Crosley <timothy.crosley@gmail.com> | 2013-11-14 00:55:42 -0500 |
---|---|---|
committer | Timothy Crosley <timothy.crosley@gmail.com> | 2013-11-14 00:55:42 -0500 |
commit | 8fa420256f9c05c3e9e67c1b2c4d761e3fefc76c (patch) | |
tree | e393622bcacb26d890df49afcf6ebbc0d32c2e9f | |
parent | ba6d10fed43ec9a8a8eec0646e27212a62d81b51 (diff) | |
parent | 2a01c3a440d02f20693b7508f3a780d1275fab1f (diff) | |
download | pies-8fa420256f9c05c3e9e67c1b2c4d761e3fefc76c.tar.gz |
Merge tag '2.0.0' into develop
2.0.0
-rw-r--r-- | .gitignore | 59 | ||||
-rw-r--r-- | MANIFEST | 11 | ||||
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | dist/pies-1.0.0.tar.gz | bin | 1504 -> 0 bytes | |||
-rw-r--r-- | dist/pies-1.0.1.tar.gz | bin | 1526 -> 0 bytes | |||
-rw-r--r-- | dist/pies-1.0.2.tar.gz | bin | 1568 -> 0 bytes | |||
-rw-r--r-- | dist/pies-1.0.3.tar.gz | bin | 1515 -> 0 bytes | |||
-rw-r--r-- | pies/overrides.py | 15 | ||||
-rw-r--r-- | pies2overrides/MANIFEST | 16 | ||||
-rw-r--r-- | pies2overrides/dist/pies2overrides-1.0.0.tar.gz | bin | 720 -> 0 bytes | |||
-rw-r--r-- | pies2overrides/setup.py | 9 | ||||
-rw-r--r-- | setup.py | 10 |
12 files changed, 103 insertions, 23 deletions
@@ -1,4 +1,57 @@ -*.pyc -~* -*.swp* +*.py[cod] +.DS_Store +# C extensions +*.so + +# Packages +*.egg +*.egg-info build +eggs +parts +var +sdist +develop-eggs +.installed.cfg +lib +lib64 +MANIFEST + +# Installer logs +pip-log.txt +npm-debug.log + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml +htmlcov +.cache + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject + +# SQLite +test_exp_framework + +# npm +node_modules/ + +# dolphin +.directory +libpeerconnection.log + +# setuptools +dist + +# IDE Files +atlassian-ide-plugin.xml +.idea/ +*.swp +*.kate-swp +.ropeproject/ @@ -1,3 +1,12 @@ # file GENERATED by distutils, do NOT edit -pies.py setup.py +pies/StringIO.py +pies/__init__.py +pies/collections.py +pies/functools.py +pies/imp.py +pies/itertools.py +pies/overrides.py +pies/pickle.py +pies/sys.py +pies/version_info.py @@ -1,7 +1,7 @@ -![isort](https://raw.github.com/timothycrosley/pies/develop/logo.png) +![Pies](https://raw.github.com/timothycrosley/pies/develop/logo.png) ==================== -[![PyPi version](https://pypip.in/v/isort/badge.png)](https://crate.io/packages/isort/) -[![PyPi downloads](https://pypip.in/d/isort/badge.png)](https://crate.io/packages/isort/) +[![PyPi version](https://pypip.in/v/pies/badge.png)](https://crate.io/packages/pies/) +[![PyPi downloads](https://pypip.in/d/pies/badge.png)](https://crate.io/packages/pies/) The simplest (and tastiest) way to write one program that runs on both Python 2.6+ and Python 3. diff --git a/dist/pies-1.0.0.tar.gz b/dist/pies-1.0.0.tar.gz Binary files differdeleted file mode 100644 index a947bf1..0000000 --- a/dist/pies-1.0.0.tar.gz +++ /dev/null diff --git a/dist/pies-1.0.1.tar.gz b/dist/pies-1.0.1.tar.gz Binary files differdeleted file mode 100644 index a91826a..0000000 --- a/dist/pies-1.0.1.tar.gz +++ /dev/null diff --git a/dist/pies-1.0.2.tar.gz b/dist/pies-1.0.2.tar.gz Binary files differdeleted file mode 100644 index 53f07e9..0000000 --- a/dist/pies-1.0.2.tar.gz +++ /dev/null diff --git a/dist/pies-1.0.3.tar.gz b/dist/pies-1.0.3.tar.gz Binary files differdeleted file mode 100644 index 6ac5bd0..0000000 --- a/dist/pies-1.0.3.tar.gz +++ /dev/null diff --git a/pies/overrides.py b/pies/overrides.py index e78da80..6c6157c 100644 --- a/pies/overrides.py +++ b/pies/overrides.py @@ -26,7 +26,7 @@ from numbers import Integral from .version_info import PY2, PY3, VERSION -__version__ = "1.0.3" +__version__ = "2.0.0" native_dict = dict native_round = round @@ -69,12 +69,13 @@ if PY3: urllib.unquote = parse.unquote urllib.unquote_plus = parse.unquote_plus urllib.urlencode = parse.urlencode - execute = getattr('builtins', 'exec') - if VERSION < '3.2': + execute = getattr(builtins, 'exec') + if VERSION[1] < 2: def callable(entity): return hasattr(entity, '__call__') + common.append('callable') - __all__ = common + ['OrderedDict', 'urllib', 'callable'] + __all__ = common + ['OrderedDict', 'urllib'] else: from itertools import ifilter as filter from itertools import imap as map @@ -163,13 +164,13 @@ else: return AttributeError("'dict' object has no attribute 'has_key'") def items(self): - return dict_items(self, 'iteritems') + return dict_items(self) def keys(self): - return dict_keys(self, 'iterkeys') + return dict_keys(self) def values(self): - return dict_values(self, 'itervalues') + return dict_values(self) def round(number, ndigits=None): return_int = False diff --git a/pies2overrides/MANIFEST b/pies2overrides/MANIFEST index 7156ab1..661cd6a 100644 --- a/pies2overrides/MANIFEST +++ b/pies2overrides/MANIFEST @@ -1,3 +1,19 @@ # file GENERATED by distutils, do NOT edit +_thread.py +builtins.py configparser.py +copyreg.py +queue.py +reprlib.py setup.py +socketserver.py +html/__init__.py +html/entities.py +html/parser.py +http/__init__.py +http/client.py +http/cookiejar.py +http/cookies.py +http/server.py +xmlrpc/__init__.py +xmlrpc/client.py diff --git a/pies2overrides/dist/pies2overrides-1.0.0.tar.gz b/pies2overrides/dist/pies2overrides-1.0.0.tar.gz Binary files differdeleted file mode 100644 index a3f449b..0000000 --- a/pies2overrides/dist/pies2overrides-1.0.0.tar.gz +++ /dev/null diff --git a/pies2overrides/setup.py b/pies2overrides/setup.py index ddbc6aa..0f11b50 100644 --- a/pies2overrides/setup.py +++ b/pies2overrides/setup.py @@ -6,17 +6,18 @@ import sys from distutils.core import setup install_requires = ['ipaddress'] -if sys.version < '2.7': +if sys.version_info[0] == 2 and sys.version_info[1] < 7: install_requires += ['ordereddict', 'argparse'] setup(name='pies2overrides', - version='1.0.0', + version='2.0.0', 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-1.0.0.tar.gz?raw=true', + download_url='https://github.com/timothycrosley/pies/blob/master/pies2overrides/dist/pies2overrides-2.0.0.tar.gz?raw=true', license="MIT", install_requires=install_requires, requires=install_requires, - py_modules=['configparser', 'builtins']) + py_modules=['configparser', 'builtins', '_thread', 'copyreg', 'queue', 'reprlib', 'socketserver'], + packages=['html', 'http', 'xmlrpc']) @@ -6,16 +6,16 @@ import sys from distutils.core import setup install_requires = [] -if sys.version < '3': +if sys.version_info[0] < 3: install_requires += ['pies2overrides'] -elif sys.version < '3.2': +elif sys.version_info[1] < 2: install_requires += ['argparse'] -if sys.version < '3.4': +if sys.version_info[0] < 3 or sys.version_info[1] < 4: install_requires += ['enum34'] setup(name='pies', - version='1.0.3', + version='2.0.0', description='The simplest way to write one program that runs on both Python 2 and Python 3.', author='Timothy Crosley', author_email='timothy.crosley@gmail.com', @@ -24,4 +24,4 @@ setup(name='pies', license="MIT", install_requires=install_requires, requires=install_requires, - py_modules=['pies']) + packages=['pies']) |