[Checkins] SVN: z3c.formui/trunk/s modernize tests, fix dependencies and imports

[Adam Groszer]

Log message for revision 127597:
  modernize tests, fix dependencies and imports

Changed:
  U   z3c.formui/trunk/setup.py
  U   z3c.formui/trunk/src/z3c/formui/README.txt
  U   z3c.formui/trunk/src/z3c/formui/tests.py

-=-
Modified: z3c.formui/trunk/setup.py
===================================================================
--- z3c.formui/trunk/setup.py	2012-08-28 08:56:37 UTC (rev 127596)
+++ z3c.formui/trunk/setup.py	2012-08-28 09:28:57 UTC (rev 127597)
@@ -18,15 +18,17 @@
 import os
 from setuptools import setup, find_packages
 
+
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-setup (
+
+setup(
     name='z3c.formui',
     version='2.3.1dev',
-    author = "Stephan Richter, Roger Ineichen and the Zope Community",
-    author_email = "zope-dev at zope.org",
-    description = "A set of initial UI components for z3c.form.",
+    author="Stephan Richter, Roger Ineichen and the Zope Community",
+    author_email="zope-dev at zope.org",
+    description="A set of initial UI components for z3c.form.",
     long_description=(
         read('README.txt')
         + '\n\n' +
@@ -36,9 +38,9 @@
         + '\n\n' +
         read('CHANGES.txt')
         ),
-    license = "ZPL 2.1",
-    keywords = "zope3 form widget",
-    classifiers = [
+    license="ZPL 2.1",
+    keywords="zope3 form widget",
+    classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
         'Intended Audience :: Developers',
@@ -48,15 +50,16 @@
         'Operating System :: OS Independent',
         'Topic :: Internet :: WWW/HTTP',
         'Framework :: Zope3'],
-    url = 'http://pypi.python.org/pypi/z3c.formui',
-    packages = find_packages('src'),
-    include_package_data = True,
-    package_dir = {'':'src'},
-    namespace_packages = ['z3c'],
-    extras_require = dict(
-        test = ['z3c.form [test]'],
+    url='http://pypi.python.org/pypi/z3c.formui',
+    packages=find_packages('src'),
+    include_package_data=True,
+    package_dir={'': 'src'},
+    namespace_packages=['z3c'],
+    extras_require=dict(
+        test=['z3c.form [test]',
+              'z3c.form [latest]'],
         ),
-    install_requires = [
+    install_requires=[
         'setuptools',
         'z3c.form >= 2.2.0',
         'z3c.macro',
@@ -65,5 +68,5 @@
         'zope.publisher',
         'zope.viewlet',
         ],
-    zip_safe = False,
+    zip_safe=False,
     )

Modified: z3c.formui/trunk/src/z3c/formui/README.txt
===================================================================
--- z3c.formui/trunk/src/z3c/formui/README.txt	2012-08-28 08:56:37 UTC (rev 127596)
+++ z3c.formui/trunk/src/z3c/formui/README.txt	2012-08-28 09:28:57 UTC (rev 127597)
@@ -481,15 +481,17 @@
   >>> from zope.configuration import xmlconfig
   >>> import zope.component
   >>> import zope.viewlet
-  >>> import zope.app.component
-  >>> import zope.app.publisher.browser
+  >>> import zope.security
+  >>> import zope.publisher
+  >>> import zope.browserresource
   >>> import z3c.macro
   >>> import z3c.template
   >>> import z3c.formui
   >>> xmlconfig.XMLConfig('meta.zcml', zope.component)()
   >>> xmlconfig.XMLConfig('meta.zcml', zope.viewlet)()
-  >>> xmlconfig.XMLConfig('meta.zcml', zope.app.component)()
-  >>> xmlconfig.XMLConfig('meta.zcml', zope.app.publisher.browser)()
+  >>> xmlconfig.XMLConfig('meta.zcml', zope.security)()
+  >>> xmlconfig.XMLConfig('meta.zcml', zope.publisher)()
+  >>> xmlconfig.XMLConfig('meta.zcml', zope.browserresource)()
   >>> xmlconfig.XMLConfig('meta.zcml', z3c.macro)()
   >>> xmlconfig.XMLConfig('meta.zcml', z3c.template)()
   >>> xmlconfig.XMLConfig('configure.zcml', z3c.formui)()
@@ -888,12 +890,12 @@
   >>> class IAdditionalInfo(zope.interface.Interface):
   ...
   ...     location = zope.schema.TextLine(title=u'Location', required=False)
-  ...     about = zope.schema.Text(title=u'About', required=False)  
+  ...     about = zope.schema.Text(title=u'About', required=False)
 
   >>> class AdditionalInfoForm(form.AddForm):
   ...
   ...     fields = field.Fields(IAdditionalInfo)
-  
+
   >>> additionalInfoForm = AdditionalInfoForm(root, divRequest)
   >>> additionalInfoForm.update()
   >>> '<div class="required-info">' in additionalInfoForm.render()

Modified: z3c.formui/trunk/src/z3c/formui/tests.py
===================================================================
--- z3c.formui/trunk/src/z3c/formui/tests.py	2012-08-28 08:56:37 UTC (rev 127596)
+++ z3c.formui/trunk/src/z3c/formui/tests.py	2012-08-28 09:28:57 UTC (rev 127597)
@@ -24,7 +24,7 @@
 
 def setUpZPT(test):
     z3c.form.testing.setUpZPT(test)
-    from zope.app.pagetemplate.metaconfigure import registerType
+    from zope.browserpage.metaconfigure import registerType
     from zope.contentprovider.tales import TALESProviderExpression
     from z3c.macro.tales import MacroExpression
     registerType('macro', MacroExpression)