Changeset 1463

Timestamp:

06/29/08 01:01:41 (3 months ago)

Author:

thijs

Message:

Update from trunk

Location:

pyamf/branches/client-headers

Files:

• . (modified) (2 props)
• ez_setup.py (modified) (6 diffs)
• pyamf (modified) (1 prop)
• pyamf/adapters (modified) (1 prop)
• pyamf/flex (modified) (1 prop)
• pyamf/remoting (modified) (1 prop)
• pyamf/remoting/client (modified) (1 prop)
• pyamf/remoting/gateway (modified) (1 prop)
• pyamf/tests (modified) (1 prop)
• pyamf/tests/adapters (modified) (1 prop)
• pyamf/tests/gateway (modified) (1 prop)
• pyamf/tests/imports (modified) (1 prop)
• pyamf/tests/imports/foo (modified) (1 prop)
• pyamf/tests/imports/foo/bar (modified) (1 prop)
• pyamf/tests/remoting (modified) (1 prop)
• pyamf/util (modified) (1 prop)

pyamf/branches/client-headers

@@ -1 +1 @@
 *.pyc
 *.egg-info
+*.class
 _trial_temp
 build

@@ -1 +1 @@
 *.pyc
 *.egg-info
+*.class
 _trial_temp
 build

pyamf/branches/client-headers/ez_setup.py

@@ -15 +15 @@
 """
 import sys
-DEFAULT_VERSION = "0.6c7"
+DEFAULT_VERSION = "0.6c8"
 DEFAULT_URL     = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
 
@@ -46 +46 @@
     'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e',
     'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372',
+    'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902',
+    'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de',
+    'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b',
 }
 
@@ -78 +81 @@
     an attempt to abort the calling script.
     """
-    try:
-        import setuptools
-        if setuptools.__version__ == '0.0.1':
-            print >>sys.stderr, (
-            "You have an obsolete version of setuptools installed.  Please\n"
-            "remove it from your system entirely before rerunning this script."
-            )
-            sys.exit(2)
-    except ImportError:
+    was_imported = 'pkg_resources' in sys.modules or 'setuptools' in sys.modules
+    def do_download():
         egg = download_setuptools(version, download_base, to_dir, download_delay)
         sys.path.insert(0, egg)
         import setuptools; setuptools.bootstrap_install_from = egg
-
-    import pkg_resources
-    try:
-        pkg_resources.require("setuptools>="+version)
-
+    try:
+        import pkg_resources
+    except ImportError:
+        return do_download()       
+    try:
+        pkg_resources.require("setuptools>="+version); return
     except pkg_resources.VersionConflict, e:
-        # XXX could we install in a subprocess here?
-        print >>sys.stderr, (
+        if was_imported:
+            print >>sys.stderr, (
             "The required version of setuptools (>=%s) is not available, and\n"
             "can't be installed while this script is running. Please install\n"
-            " a more recent version first.\n\n(Currently using %r)"
-        ) % (version, e.args[0])
-        sys.exit(2)
+            " a more recent version first, using 'easy_install -U setuptools'."
+            "\n\n(Currently using %r)"
+            ) % (version, e.args[0])
+            sys.exit(2)
+        else:
+            del pkg_resources, sys.modules['pkg_resources']    # reload ok
+            return do_download()
+    except pkg_resources.DistributionNotFound:
+        return do_download()
 
 def download_setuptools(
@@ -151 +154 @@
     return os.path.realpath(saveto)
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 def main(argv, version=DEFAULT_VERSION):
     """Install or upgrade setuptools and EasyInstall"""
-
     try:
         import setuptools
@@ -168 +205 @@
     else:
         if setuptools.__version__ == '0.0.1':
-            # tell the user to uninstall obsolete version
-            use_setuptools(version)
+            print >>sys.stderr, (
+            "You have an obsolete version of setuptools installed.  Please\n"
+            "remove it from your system entirely before rerunning this script."
+            )
+            sys.exit(2)
 
     req = "setuptools>="+version
@@ -190 +230 @@
             print '(Run "ez_setup.py -U setuptools" to reinstall or upgrade.)'
 
-
-
 def update_md5(filenames):
     """Update our built-in md5 registry"""

pyamf/branches/client-headers/pyamf

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/adapters

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/flex

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/remoting

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/remoting/client

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/remoting/gateway

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/tests

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/tests/adapters

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/tests/gateway

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/tests/imports

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/tests/imports/foo

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/tests/imports/foo/bar

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/tests/remoting

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

pyamf/branches/client-headers/pyamf/util

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
 *.egg-info
+*.class
 _trial_temp
 build

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class

@@ -1 +1 @@
 *.pyc
+*.class