diff options
author | Timothy Crosley <timothy.crosley@gmail.com> | 2013-09-03 22:33:23 -0400 |
---|---|---|
committer | Timothy Crosley <timothy.crosley@gmail.com> | 2013-09-03 22:33:23 -0400 |
commit | 9105b41a1fc9503dde3cfbeec1855790519f0754 (patch) | |
tree | 4e5187e8763109a9139e2eff33c6c0466cec529a | |
parent | 3dfe07d69dc9d9def3e42d1bd22f7a47e2586001 (diff) | |
parent | 31a06f2bd338e79923ca44055e2e7a82f08859c2 (diff) | |
download | pies-9105b41a1fc9503dde3cfbeec1855790519f0754.tar.gz |
Merge in release 1.0.21.0.2
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | MANIFEST | 1 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | build/lib.linux-x86_64-2.7/pies.py | 81 | ||||
-rw-r--r-- | configparser.py | 1 | ||||
-rw-r--r-- | dist/pies-1.0.1.tar.gz | bin | 1530 -> 1526 bytes | |||
-rw-r--r-- | dist/pies-1.0.2.tar.gz | bin | 0 -> 1581 bytes | |||
-rw-r--r-- | pies.py | 2 | ||||
-rw-r--r-- | setup.py | 15 |
9 files changed, 19 insertions, 87 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..565093f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.pyc +~* +*.swp* +build @@ -1,3 +1,4 @@ # file GENERATED by distutils, do NOT edit +configparser.py pies.py setup.py @@ -32,6 +32,8 @@ Integrating pies into your diet Using and integrating pies into an existing Python 2.6 code base (to achieve Python 3 dual support) couldn't be simpler: + from __future__ import absolute_, division, print_function, unicode_literals + from pies import * You will then simply have to make some simple changes to your Python code: diff --git a/build/lib.linux-x86_64-2.7/pies.py b/build/lib.linux-x86_64-2.7/pies.py deleted file mode 100644 index 99ffe85..0000000 --- a/build/lib.linux-x86_64-2.7/pies.py +++ /dev/null @@ -1,81 +0,0 @@ -""" - pies.py - - Adds necessary hooks to allow Python code to run on multiple major versions of Python at once - (currently 2.6 - 3.x) - - Usage: - Anywhere you want to gain support for multiple versions of Python simply add the following line - from pies import * - - Copyright (C) 2013 Timothy Edmund Crosley - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -""" - -from __future__ import division, print_function, absolute_import, unicode_literals - -import sys - -__version__ = "1.0.0" - -if sys.version > '3': - import urllib - from urllib import parse - - from collections import OrderedDict - - long = int - unicode = str - - def u(string): - return string - - def iteritems(collection): - return collection.items() - - def itervalues(collection): - return collection.values() - - def iterkeys(collection): - return collection.keys() - - def xrange(*args): - return range(*args) - - urllib.quote = parse.quote - urllib.quote_plus = parse.quote_plus - urllib.unquote = parse.unquote - urllib.unquote_plus = parse.unquote_plus - urllib.urlencode = parse.urlencode -else: - try: - from collections import OrderedDict - except ImportError: - from ordereddict import OrderedDict - - import codecs - - def u(string): - return codecs.unicode_escape_decode(string)[0] - - def iteritems(collection): - return collection.iteritems() - - def itervalues(collection): - return collection.itervalues() - - def iterkeys(collection): - return collection.iterkeys() diff --git a/configparser.py b/configparser.py new file mode 100644 index 0000000..b2da53a --- /dev/null +++ b/configparser.py @@ -0,0 +1 @@ +from ConfigParser import * diff --git a/dist/pies-1.0.1.tar.gz b/dist/pies-1.0.1.tar.gz Binary files differindex 2990963..a91826a 100644 --- a/dist/pies-1.0.1.tar.gz +++ b/dist/pies-1.0.1.tar.gz diff --git a/dist/pies-1.0.2.tar.gz b/dist/pies-1.0.2.tar.gz Binary files differnew file mode 100644 index 0000000..aea5751 --- /dev/null +++ b/dist/pies-1.0.2.tar.gz @@ -25,8 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. """ -from __future__ import division, print_function, absolute_import, unicode_literals - import sys if sys.version > '3': @@ -1,15 +1,22 @@ #!/usr/bin/env python from distutils.core import setup +import sys + +py_modules = ['pies'] +install_requires = [] +if sys.version < '3': + install_requires += ['ordereddict', 'argparse'] + py_modules += ['configparser'] setup(name='pies', - version='1.0.1', + version='1.0.2', 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', url='https://github.com/timothycrosley/pies', download_url='https://github.com/timothycrosley/pies/blob/master/dist/pies-1.0.0.tar.gz?raw=true', license="GNU GPLv2", - install_requires=['ordereddict'], - requires=['ordereddict'], - py_modules=['pies']) + install_requires=install_requires, + requires=install_requires, + py_modules=py_modules) |