X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/471e64d61eebd501933423285e84917f85cb5ed1..1dc9b42f4f911152fb1bea3e6f532769d08a023b:/wxPython/setup.py diff --git a/wxPython/setup.py b/wxPython/setup.py index cdaa055bfc..0cab5788e2 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -82,24 +82,16 @@ CLEANUP.append('wx/__version__.py') if USE_SWIG: try: - # It may come on either stdout or stderr, depending on the - # version, so read both. - i, o, e = os.popen3(SWIG + ' -version', 't') - stext = o.read() + e.read() - import re - match = re.search(r'[0-9]+\.[0-9]+\.[0-9]+$', stext, re.MULTILINE) - if not match: - raise 'NotFound' - SVER = match.group(0) + SVER = swig_version() open('include/wx/wxPython/swigver.h', 'w').write('''\ // This file was generated by setup.py #define wxPy_SWIG_VERSION "SWIG-%s" ''' % SVER) msg('Using SWIG-' + SVER) - except: msg('\nUnable to get SWIG version number\n') + #----------------------------------------------------------------------