From 88b892079d8d3fb82ad04287b48ef6ea93963e2e Mon Sep 17 00:00:00 2001 From: shimizukawa <> Date: Sun, 10 Apr 2011 03:00:18 +0900 Subject: [PATCH] setup now have 2to3 sequence that functionality depend on `distribute` package. --- .bzrignore | 2 ++ pyreadline/release.py | 3 ++- setup.py | 21 ++++++++++++++++++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/.bzrignore b/.bzrignore index c095e69..5d658c0 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,2 +1,4 @@ build +dist +pyreadline.egg-info/ __pycache__/ diff --git a/pyreadline/release.py b/pyreadline/release.py index 38926f6..db5cb03 100644 --- a/pyreadline/release.py +++ b/pyreadline/release.py @@ -53,7 +53,7 @@ Features: license = 'BSD' -authors = {'Jorgen' : ('Jorgen Stenarson','jorgen.stenarson@bostream.n'), +authors = {'Jorgen' : ('Jorgen Stenarson','jorgen.stenarson@bostream.nu'), 'Gary': ('Gary Bishop', ''), 'Jack': ('Jack Trainor', ''), } @@ -76,6 +76,7 @@ classifiers = ['Development Status :: 5 - Production/Stable', 'Programming Language :: Python :: 2.5', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3.2', ] diff --git a/setup.py b/setup.py index 504b125..9501c1d 100644 --- a/setup.py +++ b/setup.py @@ -9,6 +9,7 @@ #***************************************************************************** import os +import sys import glob # BEFORE importing distutils, remove MANIFEST. distutils doesn't properly @@ -16,7 +17,24 @@ import glob if os.path.exists('MANIFEST'): os.remove('MANIFEST') # -from distutils.core import setup +extra = {} +_distribute = False + +try: + import setuptools + setup = setuptools.setup + _distribute = getattr(setuptools, '_distribute', False) +except ImportError: + from distutils.core import setup + +if sys.version_info >= (3, 0): + if _distribute == False: + raise RuntimeError('You must installed `distribute` to setup pyreadline with Python3') + + extra.update( + use_2to3=True + ) + exec(compile(open('pyreadline/release.py').read(), 'pyreadline/release.py', 'exec')) try: @@ -50,5 +68,6 @@ setup(name=name, package_data = {'pyreadline':['configuration/*']}, data_files = [], cmdclass = cmd_class, + **extra )