[Checkins] SVN: z3c.viewlet/trunk/ Preparing release 1.1.0

[Michael Howitz]

Log message for revision 96878:
  Preparing release 1.1.0

Changed:
  U   z3c.viewlet/trunk/CHANGES.txt
  U   z3c.viewlet/trunk/README.txt
  U   z3c.viewlet/trunk/setup.py
  U   z3c.viewlet/trunk/src/z3c/viewlet/manager.py

-=-
Modified: z3c.viewlet/trunk/CHANGES.txt
===================================================================
--- z3c.viewlet/trunk/CHANGES.txt	2009-02-21 09:09:44 UTC (rev 96877)
+++ z3c.viewlet/trunk/CHANGES.txt	2009-02-21 09:46:16 UTC (rev 96878)
@@ -2,6 +2,13 @@
 CHANGES
 =======
 
+1.1.0 (2009-02-21)
+------------------
+
+- Marked as deprecated, as all functionality has already been moved
+  to ``zope.viewlet``.
+
+
 1.0.0 (2007-10-30)
 ------------------
 

Modified: z3c.viewlet/trunk/README.txt
===================================================================
--- z3c.viewlet/trunk/README.txt	2009-02-21 09:09:44 UTC (rev 96877)
+++ z3c.viewlet/trunk/README.txt	2009-02-21 09:46:16 UTC (rev 96878)
@@ -1,2 +1 @@
-This package is a collection of viewlet extensions; see ``zope.viewlet`` for
-more information.
+This package is deprecated. All its functionality moved to ``zope.viewlet``.

Modified: z3c.viewlet/trunk/setup.py
===================================================================
--- z3c.viewlet/trunk/setup.py	2009-02-21 09:09:44 UTC (rev 96877)
+++ z3c.viewlet/trunk/setup.py	2009-02-21 09:46:16 UTC (rev 96878)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2007 Zope Corporation and Contributors.
+# Copyright (c) 2007-2009 Zope Corporation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -21,24 +21,17 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+version = '1.1.0'
+
 setup(name='z3c.viewlet',
-      version = '1.1.0',
+      version = version,
       author='Zope Corporation and Contributors',
-      author_email='zope3-dev at zope.org',
-      description='Collection of Viewlet Extensions',
-      long_description=(
-          read('README.txt')
-          + '\n\n' +
-          'Detailed Dcoumentation\n' +
-          '======================\n'
-          + '\n\n' +
-          read('src', 'z3c', 'viewlet', 'README.txt')
-          + '\n\n' +
-          read('CHANGES.txt')
-          ),
+      author_email='zope-dev at zope.org',
+      description='DEPRCATED: Collection of Viewlet Extensions',
+      long_description=read('README.txt'),
       keywords = "zope3 viewlet extension weight ordered",
       classifiers = [
-          'Development Status :: 5 - Production/Stable',
+          'Development Status :: 7 - Inactive',
           'Environment :: Web Environment',
           'Intended Audience :: Developers',
           'License :: OSI Approved :: Zope Public License',
@@ -47,14 +40,16 @@
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope3'],
-      url='http://cheeseshop.python.org/pypi/z3c.viewlet',
+      url='http://pypi.python.org/pypi/z3c.viewlet',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['z3c'],
       extras_require=dict(test=['zope.testing']),
       install_requires=['setuptools',
-                        'zope.viewlet'],
+                        'zope.viewlet',
+                        'zope.deferredimport',
+                        ],
       include_package_data = True,
       zip_safe = False,
       )

Modified: z3c.viewlet/trunk/src/z3c/viewlet/manager.py
===================================================================
--- z3c.viewlet/trunk/src/z3c/viewlet/manager.py	2009-02-21 09:09:44 UTC (rev 96877)
+++ z3c.viewlet/trunk/src/z3c/viewlet/manager.py	2009-02-21 09:46:16 UTC (rev 96878)
@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2005 Zope Foundation and Contributors.
+# Copyright (c) 2005-2009 Zope Foundation and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the Zope Public License,
@@ -15,17 +15,10 @@
 $Id$
 """
 
-from zope.viewlet import manager
+import zope.deferredimport
 
-
-def getWeight((name, viewlet)):
-    try:
-        return int(viewlet.weight)
-    except AttributeError:
-        return 0
-
-
-class WeightOrderedViewletManager(manager.ViewletManagerBase):
-
-    def sort(self, viewlets):
-        return sorted(viewlets, key=getWeight)
+zope.deferredimport.initialize()
+zope.deferredimport.deprecated(
+    "z3c.viewlet is deprecated, all its functionality moved to zope.viewlet.",
+    getWeight = 'zope.viewlet.manager:getWeight',
+    WeightOrderedViewletManager = 'zope.viewlet.manager:WeightOrderedViewletManager')