improve 2to3 check, add 3.2 to compatibility list

git-svn-id: http://svn.code.sf.net/p/pyserial/code/trunk/pyserial@427 f19166aa-fa4f-0410-85c2-fa1106f25c8a

1 files changed, 8 insertions, 7 deletions

diff --git a/setup.py b/setup.py
index 8b8e0bf..082bfe1 100644
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,17 @@ import sys
 
 from distutils.core import setup
 
-try:
-    from distutils.command.build_py import build_py_2to3 as build_py
-    from distutils.command.build_scripts import build_scripts_2to3 as build_scripts
-except ImportError:
-    if sys.version_info >= (3, 0):
+if sys.version_info >= (3, 0):
+    try:
+        from distutils.command.build_py import build_py_2to3 as build_py
+        from distutils.command.build_scripts import build_scripts_2to3 as build_scripts
+    except ImportError:
         raise ImportError("build_py_2to3 not found in distutils - it is required for Python 3.x")
+    suffix = "-py3k"
+else:
     from distutils.command.build_py import build_py
     from distutils.command.build_scripts import build_scripts
     suffix = ""
-else:
-    suffix = "-py3k"
 
 
 if sys.version < '2.3':
@@ -73,6 +73,7 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.0',
         'Programming Language :: Python :: 3.1',
+        'Programming Language :: Python :: 3.2',
         'Topic :: Communications',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',