[Checkins] SVN: Products.PluggableAuthService/trunk/setup.py - cleanup

[Jens Vagelpohl]

Log message for revision 90860:
  - cleanup

Changed:
  U   Products.PluggableAuthService/trunk/setup.py

-=-
Modified: Products.PluggableAuthService/trunk/setup.py
===================================================================
--- Products.PluggableAuthService/trunk/setup.py	2008-09-05 08:07:49 UTC (rev 90859)
+++ Products.PluggableAuthService/trunk/setup.py	2008-09-05 08:16:59 UTC (rev 90860)
@@ -2,29 +2,25 @@
 from setuptools import setup
 from setuptools import find_packages
 
+NAME = 'PluggableAuthService'
+
 here = os.path.abspath(os.path.dirname(__file__))
-package = os.path.join(here, 'Products', 'PluggableAuthService')
+package = os.path.join(here, 'Products', NAME)
 
 def _package_doc(name):
     f = open(os.path.join(package, name))
     return f.read()
 
-NAME = 'PluggableAuthService'
-
-VERSION = _package_doc('version.txt').strip()
-if VERSION.startswith(NAME):
-    VERSION = VERSION[len(NAME):]
-while VERSION and VERSION[0] in '-_.':
-    VERSION = VERSION[1:]
-
-_boundary = '\n' + ('-' * 60) + '\n'
+_boundary = '\n' + ('-' * 60) + '\n\n'
 README = ( _package_doc('README.txt')
-         + _boundary + _package_doc('doc/CHANGES.txt')
-         + _boundary + "\nDownload\n========"
+         + _boundary 
+         + _package_doc('doc/CHANGES.txt')
+         + _boundary 
+         + "Download\n========"
          )
 
-setup(name='Products.PluggableAuthService',
-      version=VERSION,
+setup(name='Products.%s' % NAME,
+      version=_package_doc('version.txt').strip(),
       description='Pluggable Zope2 authentication / authorization framework',
       long_description=README,
       classifiers=[
@@ -41,7 +37,7 @@
         ],
       keywords='web application server zope zope2',
       author="Zope Corporation and contributors",
-      author_email="zope-cmf at lists.zope.org",
+      author_email="zope-cmf at zope.org",
       url="http://pypi.python.org/pypi/Products.PluggableAuthService",
       license="ZPL 2.1 (http://www.zope.org/Resources/License/ZPL-2.1)",
       packages=find_packages(),
@@ -58,6 +54,6 @@
                      },
       entry_points="""
       [zope2.initialize]
-      Products.PluggableAuthService = Products.PluggableAuthService:initialize
-      """,
+      Products.%s = Products.%s:initialize
+      """ % (NAME, NAME),
       )