[Checkins] SVN: z3c.widgets.flashupload/trunk/ Updated package metadata and bootstrap file

[Hanno Schlichting]

Log message for revision 105198:
  Updated package metadata and bootstrap file
  

Changed:
  A   z3c.widgets.flashupload/trunk/README.txt
  U   z3c.widgets.flashupload/trunk/bootstrap.py
  U   z3c.widgets.flashupload/trunk/buildout.cfg
  U   z3c.widgets.flashupload/trunk/setup.py
  U   z3c.widgets.flashupload/trunk/src/z3c/__init__.py
  U   z3c.widgets.flashupload/trunk/src/z3c/widgets/__init__.py
  D   z3c.widgets.flashupload/trunk/src/z3c/widgets/flashupload/SETUP.cfg
  D   z3c.widgets.flashupload/trunk/src/z3c/widgets/flashupload/z3c.widget.flashupload-configure.zcml

-=-
Added: z3c.widgets.flashupload/trunk/README.txt
===================================================================
--- z3c.widgets.flashupload/trunk/README.txt	                        (rev 0)
+++ z3c.widgets.flashupload/trunk/README.txt	2009-10-21 15:53:52 UTC (rev 105198)
@@ -0,0 +1,4 @@
+Overview
+========
+
+A Zope specific flash upload widget.


Property changes on: z3c.widgets.flashupload/trunk/README.txt
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: z3c.widgets.flashupload/trunk/bootstrap.py
===================================================================
--- z3c.widgets.flashupload/trunk/bootstrap.py	2009-10-21 15:44:25 UTC (rev 105197)
+++ z3c.widgets.flashupload/trunk/bootstrap.py	2009-10-21 15:53:52 UTC (rev 105198)
@@ -24,6 +24,8 @@
 
 tmpeggs = tempfile.mkdtemp()
 
+is_jython = sys.platform.startswith('java')
+
 try:
     import pkg_resources
 except ImportError:
@@ -34,23 +36,49 @@
 
     import pkg_resources
 
-cmd = 'from setuptools.command.easy_install import main; main()'
 if sys.platform == 'win32':
-    cmd = '"%s"' % cmd # work around spawn lamosity on windows
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    def quote (c):
+        return c
 
-ws = pkg_resources.working_set
-assert os.spawnle(
-    os.P_WAIT, sys.executable, sys.executable,
-    '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
-    dict(os.environ,
-         PYTHONPATH=
-         ws.find(pkg_resources.Requirement.parse('setuptools')).location
-         ),
-    ) == 0
+cmd = 'from setuptools.command.easy_install import main; main()'
+ws  = pkg_resources.working_set
 
+if len(sys.argv) > 2 and sys.argv[1] == '--version':
+    VERSION = '==%s' % sys.argv[2]
+    args = sys.argv[3:] + ['bootstrap']
+else:
+    VERSION = ''
+    args = sys.argv[1:] + ['bootstrap']
+
+if is_jython:
+    import subprocess
+
+    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
+           quote(tmpeggs), 'zc.buildout' + VERSION],
+           env=dict(os.environ,
+               PYTHONPATH=
+               ws.find(pkg_resources.Requirement.parse('setuptools')).location
+               ),
+           ).wait() == 0
+
+else:
+    assert os.spawnle(
+        os.P_WAIT, sys.executable, quote (sys.executable),
+        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
+        dict(os.environ,
+            PYTHONPATH=
+            ws.find(pkg_resources.Requirement.parse('setuptools')).location
+            ),
+        ) == 0
+
 ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+ws.require('zc.buildout' + VERSION)
 import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+zc.buildout.buildout.main(args)
 shutil.rmtree(tmpeggs)
-

Modified: z3c.widgets.flashupload/trunk/buildout.cfg
===================================================================
--- z3c.widgets.flashupload/trunk/buildout.cfg	2009-10-21 15:44:25 UTC (rev 105197)
+++ z3c.widgets.flashupload/trunk/buildout.cfg	2009-10-21 15:53:52 UTC (rev 105198)
@@ -5,4 +5,4 @@
 [test]
 recipe = zc.recipe.testrunner
 defaults = ['--tests-pattern', '^f?tests$']
-eggs = z3c.widget [test]
+eggs = z3c.widgets.flashupload [test]

Modified: z3c.widgets.flashupload/trunk/setup.py
===================================================================
--- z3c.widgets.flashupload/trunk/setup.py	2009-10-21 15:44:25 UTC (rev 105197)
+++ z3c.widgets.flashupload/trunk/setup.py	2009-10-21 15:53:52 UTC (rev 105198)
@@ -5,9 +5,12 @@
       author = "Zope Community",
       author_email = "zope-dev at zope.org",
       description = "Zope Flash Upload Widget",
+      long_description=".. contents::\n\n" +
+                        open("README.txt").read() + "\n" +
+                        open("CHANGES.txt").read(),
       license = "ZPL 2.1",
       keywords = "zope",
-      url='http://svn.zope.org/z3c.widgets.flashupload',
+      url='http://pypi.python.org/pypi/z3c.widgets.flashupload',
       zip_safe=False,
       packages=find_packages('src'),
       include_package_data=True,
@@ -44,8 +47,7 @@
                           'zope.security',
                           'zope.traversing',
                           ],
-      classifiers = ['Development Status :: 4 - Beta',
-                     'Environment :: Web Environment',
+      classifiers = ['Environment :: Web Environment',
                      'Framework :: Zope3',
                      'Intended Audience :: Developers',
                      'License :: OSI Approved :: Zope Public License',

Modified: z3c.widgets.flashupload/trunk/src/z3c/__init__.py
===================================================================
--- z3c.widgets.flashupload/trunk/src/z3c/__init__.py	2009-10-21 15:44:25 UTC (rev 105197)
+++ z3c.widgets.flashupload/trunk/src/z3c/__init__.py	2009-10-21 15:53:52 UTC (rev 105198)
@@ -1,6 +1 @@
-try:
-    # Declare this a namespace package if pkg_resources is available.
-    import pkg_resources
-    pkg_resources.declare_namespace('z3c')
-except ImportError:
-    pass
+__import__('pkg_resources').declare_namespace(__name__)

Modified: z3c.widgets.flashupload/trunk/src/z3c/widgets/__init__.py
===================================================================
--- z3c.widgets.flashupload/trunk/src/z3c/widgets/__init__.py	2009-10-21 15:44:25 UTC (rev 105197)
+++ z3c.widgets.flashupload/trunk/src/z3c/widgets/__init__.py	2009-10-21 15:53:52 UTC (rev 105198)
@@ -1 +1 @@
-
+__import__('pkg_resources').declare_namespace(__name__)

Deleted: z3c.widgets.flashupload/trunk/src/z3c/widgets/flashupload/SETUP.cfg
===================================================================
--- z3c.widgets.flashupload/trunk/src/z3c/widgets/flashupload/SETUP.cfg	2009-10-21 15:44:25 UTC (rev 105197)
+++ z3c.widgets.flashupload/trunk/src/z3c/widgets/flashupload/SETUP.cfg	2009-10-21 15:53:52 UTC (rev 105198)
@@ -1,3 +0,0 @@
-<data-files zopeskel/etc/package-includes>
-  z3c.widget.flashupload-*.zcml
-</data-files>

Deleted: z3c.widgets.flashupload/trunk/src/z3c/widgets/flashupload/z3c.widget.flashupload-configure.zcml
===================================================================
--- z3c.widgets.flashupload/trunk/src/z3c/widgets/flashupload/z3c.widget.flashupload-configure.zcml	2009-10-21 15:44:25 UTC (rev 105197)
+++ z3c.widgets.flashupload/trunk/src/z3c/widgets/flashupload/z3c.widget.flashupload-configure.zcml	2009-10-21 15:53:52 UTC (rev 105198)
@@ -1 +0,0 @@
-<include package="z3c.widget.flashupload" />
\ No newline at end of file