[Checkins] SVN: z3c.zrtresource/trunk/ - Got rid of dependency on ``zope.app.component`` and

[Michael Howitz]

Log message for revision 101277:
  - Got rid of dependency on ``zope.app.component`` and
    ``zope.app.pagetemplate``.
  
  - Fixed home page and author email address.
  
  

Changed:
  U   z3c.zrtresource/trunk/CHANGES.txt
  U   z3c.zrtresource/trunk/setup.py
  U   z3c.zrtresource/trunk/src/z3c/zrtresource/replace.py
  U   z3c.zrtresource/trunk/src/z3c/zrtresource/zrtresource.py

-=-
Modified: z3c.zrtresource/trunk/CHANGES.txt
===================================================================
--- z3c.zrtresource/trunk/CHANGES.txt	2009-06-25 14:54:47 UTC (rev 101276)
+++ z3c.zrtresource/trunk/CHANGES.txt	2009-06-25 17:07:41 UTC (rev 101277)
@@ -2,6 +2,15 @@
 CHANGES
 =======
 
+1.2.0 (unreleased)
+------------------
+
+- Got rid of dependency on ``zope.app.component`` and
+  ``zope.app.pagetemplate``.
+
+- Fixed home page and author email address.
+
+
 1.1.0 (2007-12-01)
 ------------------
 

Modified: z3c.zrtresource/trunk/setup.py
===================================================================
--- z3c.zrtresource/trunk/setup.py	2009-06-25 14:54:47 UTC (rev 101276)
+++ z3c.zrtresource/trunk/setup.py	2009-06-25 17:07:41 UTC (rev 101277)
@@ -21,17 +21,17 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+version = '1.2.0dev',
+
+
 setup(name='z3c.zrtresource',
-      version = '1.2.0dev',
+      version=version,
       author='Zope Corporation and Contributors',
-      author_email='zope3-dev at zope.org',
+      author_email='zope-dev at zope.org',
       description='Zope Resource Templates',
       long_description=(
           read('README.txt')
-          + '\n\n' +
-          'Detailed Dcoumentation\n' +
-          '======================\n'
-          + '\n\n' +
+          + '\n\n.. contents::\n\n' +
           read('src', 'z3c', 'zrtresource', 'README.txt')
           + '\n\n' +
           read('src', 'z3c', 'zrtresource', 'zcml.txt')
@@ -49,7 +49,7 @@
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope3'],
-      url='http://cheeseshop.python.org/pypi/z3c.zrtresource',
+      url='http://pypi.python.org/pypi/z3c.zrtresource',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir = {'': 'src'},
@@ -59,15 +59,15 @@
                                   'zope.traversing',
                                   ]),
       install_requires = ['setuptools',
-                          'zope.app.component',
-                          'zope.app.pagetemplate',
+                          'zope.site',
+                          'zope.pagetemplate >= 3.5.0',
                           'zope.app.publisher',
                           'zope.component',
                           'zope.configuration',
                           'zope.interface',
                           'zope.publisher',
                           'zope.schema',
-                          'zope.security',
+                          'zope.security [untrustedpython]',
                           ],
       include_package_data = True,
       zip_safe = False,

Modified: z3c.zrtresource/trunk/src/z3c/zrtresource/replace.py
===================================================================
--- z3c.zrtresource/trunk/src/z3c/zrtresource/replace.py	2009-06-25 14:54:47 UTC (rev 101276)
+++ z3c.zrtresource/trunk/src/z3c/zrtresource/replace.py	2009-06-25 17:07:41 UTC (rev 101277)
@@ -18,7 +18,7 @@
 __docformat__='restructuredtext'
 import re
 import zope.interface
-from zope.app.pagetemplate import engine
+from zope.pagetemplate import engine
 from z3c.zrtresource import interfaces
 
 # <EXPR-TYPE>"<INPUT-EXPR>" <EXPR-TYPE>"<OUTPUT-EXPR>" <NUM>

Modified: z3c.zrtresource/trunk/src/z3c/zrtresource/zrtresource.py
===================================================================
--- z3c.zrtresource/trunk/src/z3c/zrtresource/zrtresource.py	2009-06-25 14:54:47 UTC (rev 101276)
+++ z3c.zrtresource/trunk/src/z3c/zrtresource/zrtresource.py	2009-06-25 17:07:41 UTC (rev 101277)
@@ -16,7 +16,7 @@
 $Id$
 """
 __docformat__='restructuredtext'
-from zope.app.component.hooks import getSite
+from zope.site.hooks import getSite
 from zope.app.publisher.fileresource import File
 from zope.app.publisher.browser.fileresource import FileResource