merge str_util_python3.c into str_util.c

--HG--
branch : python3

1 files changed, 5 insertions, 3 deletions

diff --git a/setup.py b/setup.py
index 8cf1fe0..bdc46f1 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,10 @@ except ImportError:
 
 import os
 
-PYTHON3 = not str is bytes
+try:
+    PYTHON3 = not str is bytes
+except NameError:
+    PYTHON3 = False
 
 exec(open(os.path.join("urwid","version.py")).read())
 release = __version__
@@ -38,8 +41,7 @@ setup_d = {
     'version':release,
     'author':"Ian Ward",
     'author_email':"ian@excess.org",
-    'ext_modules':[Extension('urwid.str_util',
-        sources=['source/str_util%s.c' % ("_python3" * PYTHON3)])],
+    'ext_modules':[Extension('urwid.str_util', sources=['source/str_util.c'])],
     'url':"http://excess.org/urwid/",
     'download_url':"http://excess.org/urwid/urwid-%s.tar.gz"%release,
     'license':"LGPL",