From ef76ac07c52194483b75caee8b2610dce1eca063 Mon Sep 17 00:00:00 2001 From: milde Date: Tue, 27 Aug 2019 15:30:40 +0000 Subject: Remove autoconversion code. Conversion with 2to3 is no longer required. The documentation and 'tox.ini' file are updated accordingly. Based on a patch by Stephen Finucane . git-svn-id: http://svn.code.sf.net/p/docutils/code/trunk@8375 929543f6-e4f2-0310-98a6-ba3bd3dd1d04 --- docutils/setup.py | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'docutils/setup.py') diff --git a/docutils/setup.py b/docutils/setup.py index 6f3e89c30..b952cdb40 100755 --- a/docutils/setup.py +++ b/docutils/setup.py @@ -13,9 +13,6 @@ try: from distutils.core import setup, Command from distutils.command.build import build from distutils.command.build_py import build_py - if sys.version_info >= (3, 0): - from distutils.command.build_py import build_py_2to3 - from distutils.util import copydir_run_2to3 from distutils.command.install_data import install_data from distutils.util import convert_path from distutils import log @@ -27,36 +24,6 @@ except ImportError: sys.exit(1) -if sys.version_info >= (3, 0): - # copy-convert auxiliary python sources - class copy_build_py_2to3(build_py_2to3): - """Copy/convert Python source files in given directories recursively. - - Build py3k versions of the modules and packages. - Also copy 'test/' suite and run 2to3 on *.py files. - """ - manifest_in = """\ - exclude *.pyc *~ .DS_Store - recursive-exclude * *.pyc *~ .DS_Store - recursive-exclude functional/output * - include functional/output/README.txt - prune .svn - prune */.svn - prune */*/.svn - prune */*/*/.svn - prune */*/*/*/.svn - prune */*/*/*/*/.svn - """ - def run(self): - # fix - print("build_py_2to3") - build_py_2to3.run(self) - print("copy/convert test suite") - loglevel = log.set_threshold(log.ERROR) - copydir_run_2to3('test', 'test3', template=self.manifest_in) - log.set_threshold(loglevel) - - class smart_install_data(install_data): # From , # by Pete Shinners. @@ -96,11 +63,6 @@ def do_setup(): # Install data files properly. kwargs['cmdclass'] = {'build_data': build_data, 'install_data': smart_install_data} - # Auto-convert source code for Python 3 - if sys.version_info >= (3, 0): - kwargs['cmdclass']['build_py'] = copy_build_py_2to3 - else: - kwargs['cmdclass']['build_py'] = build_py dist = setup(**kwargs) return dist -- cgit v1.2.1