[tor-commits] [stem/master] Don't do a 2to3 conversion when running setup.py

[atagar at torproject.org]

commit 670b77e1a4a5cbde400547bd0ed0f47450845bac
Author: Damian Johnson <atagar at torproject.org>
Date:   Sat Jan 3 18:12:43 2015 -0800

    Don't do a 2to3 conversion when running setup.py
    
    Now that we have a unified codebase there's no longer any need to do a 2to3
    conversion. Tested this by running...
    
      % python setup.py build
    
      ... and....
    
      % python3 setup.py build
    
    Then checking with either both python2 and python3 can import some modules.
---
 docs/faq.rst |    4 +---
 setup.py     |    6 ------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 1c0dd70..eb7f06f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -55,9 +55,7 @@ functionality.
 What Python versions is Stem compatible with?
 ---------------------------------------------
 
-Stem works with **Python 2.6 and greater**. This includes the Python 3.x series
-by installing Stem via python3 (see our `installation instructions
-<https://pypi.python.org/pypi/stem/>`_ for more information).
+Stem works with **Python 2.6 and greater**, including the Python 3.x series.
 
 .. _can_i_interact_with_tors_controller_interface_directly:
 
diff --git a/setup.py b/setup.py
index 1c02494..f6abc90 100644
--- a/setup.py
+++ b/setup.py
@@ -33,11 +33,6 @@ def get_module_info():
 
   return result
 
-try:
-  from distutils.command.build_py import build_py_2to3 as build_py
-except ImportError:
-  from distutils.command.build_py import build_py
-
 module_info = get_module_info()
 
 setup(
@@ -50,7 +45,6 @@ setup(
   url = module_info['url'],
   packages = ['stem', 'stem.descriptor', 'stem.interpreter', 'stem.response', 'stem.util'],
   provides = ['stem'],
-  cmdclass = {'build_py': build_py},
   keywords = 'tor onion controller',
   scripts = ['tor-prompt'],
   package_data = {'stem.interpreter': ['settings.cfg'], 'stem.util': ['ports.cfg']},