Prechádzať zdrojové kódy

Damn, I love the smell of Solaris in the morning.

Chris McDonough 18 rokov pred
rodič
commit
9925bfcef1
2 zmenil súbory, kde vykonal 19 pridanie a 0 odobranie
  1. 11 0
      CHANGES.txt
  2. 8 0
      setup.py

+ 11 - 0
CHANGES.txt

@@ -38,6 +38,17 @@
     about the process' exit status when determining whether to restart
     it or not.
 
+  - setup.py develop (and presumably setup.py install) would fail
+    under Python 2.3.3, because setuptools attempted to import
+    'splituser' from urllib2, and it didn't exist.
+
+  - It's now possible to use 'setup.py install' and 'setup.py develop'
+    on systems which do not have a C compiler if you set the environment
+    variable "NO_MELD3_EXTENSION_MODULES=1" in the shell in which
+    you invoke these commands (a new version of meld3, 0.6.1 was released
+    which respects this envvar and does not try to compile its optional
+    C extensions when it's set).
+
 3.0a1
 
   - Default config file comment documented 10 secs as default for

+ 8 - 0
setup.py

@@ -14,6 +14,14 @@
 
 __revision__ = '$Id$'
 
+
+import urllib
+import urllib2
+if not hasattr(urllib2, 'splituser'):
+    # setuptools wants to import this from urllib2 but it's not
+    # in there in Python 2.3.3, so we just alias it.
+    urllib2.splituser = urllib.splituser
+
 from ez_setup import use_setuptools
 use_setuptools()