[Checkins] SVN: z3c.form/trunk/ Use zope.site and zope.container in imports. Yay, no direct zope.app.* dependencies! :-)

[Dan Korostelev]

Log message for revision 96049:
  Use zope.site and zope.container in imports. Yay, no direct zope.app.* dependencies! :-)
  Change 2008-??-?? to unreleased in the CHANGES.txt - it's no 2008 now.
  Remove zope.app.pagetemplate dependency (z3c.ptcompat does the job now).

Changed:
  U   z3c.form/trunk/CHANGES.txt
  U   z3c.form/trunk/buildout.cfg
  U   z3c.form/trunk/setup.py
  U   z3c.form/trunk/src/z3c/form/adding.txt
  U   z3c.form/trunk/src/z3c/form/browser/README.txt
  U   z3c.form/trunk/src/z3c/form/browser/image.py
  U   z3c.form/trunk/src/z3c/form/button.py
  U   z3c.form/trunk/src/z3c/form/group.txt

-=-
Modified: z3c.form/trunk/CHANGES.txt
===================================================================
--- z3c.form/trunk/CHANGES.txt	2009-02-03 20:23:05 UTC (rev 96048)
+++ z3c.form/trunk/CHANGES.txt	2009-02-03 20:49:14 UTC (rev 96049)
@@ -2,7 +2,7 @@
 CHANGES
 =======
 
-Version 2.0.0 (2008-??-??)
+Version 2.0.0 (unreleased)
 --------------------------
 - Feature: add the 'prompt' attribute of the SequenceWidget to the list of
   adaptable attributes.

Modified: z3c.form/trunk/buildout.cfg
===================================================================
--- z3c.form/trunk/buildout.cfg	2009-02-03 20:23:05 UTC (rev 96048)
+++ z3c.form/trunk/buildout.cfg	2009-02-03 20:49:14 UTC (rev 96049)
@@ -4,7 +4,6 @@
 versions = versions
 
 [versions]
-zope.app.locales = 3.4.5
 z3c.pt.compat = 0.3
 
 [test-environment]

Modified: z3c.form/trunk/setup.py
===================================================================
--- z3c.form/trunk/setup.py	2009-02-03 20:23:05 UTC (rev 96048)
+++ z3c.form/trunk/setup.py	2009-02-03 20:49:14 UTC (rev 96049)
@@ -78,6 +78,7 @@
         test = [
             'zope.app.testing',
             'zope.app.container',
+            'zope.app.pagetemplate',
             'zope.app.i18n',
             'zope.testing',
             'z3c.coverage',
@@ -90,8 +91,6 @@
         ),
     install_requires = [
         'setuptools',
-        'zope.app.component',
-        'zope.app.pagetemplate',
         'zope.browser',
         'zope.component',
         'zope.configuration',
@@ -105,9 +104,9 @@
         'zope.publisher',
         'zope.schema',
         'zope.security',
+        'zope.site',
         'zope.traversing',
-        'z3c.pt.compat >= 0.3',
+        'z3c.pt.compat >= 0.3', # XXX This should change to z3c.ptcompat
         ],
-    dependency_links = ['http://download.zope.org/distribution'],
     zip_safe = False,
     )

Modified: z3c.form/trunk/src/z3c/form/adding.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/adding.txt	2009-02-03 20:23:05 UTC (rev 96048)
+++ z3c.form/trunk/src/z3c/form/adding.txt	2009-02-03 20:49:14 UTC (rev 96049)
@@ -35,7 +35,7 @@
 
 Next we need a container to which we wish to add the person:
 
-  >>> from zope.app.container import btree
+  >>> from zope.container import btree
   >>> people = btree.BTreeContainer()
 
 When creating and adding a new object using the ``IAdding`` API, the container

Modified: z3c.form/trunk/src/z3c/form/browser/README.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/README.txt	2009-02-03 20:23:05 UTC (rev 96048)
+++ z3c.form/trunk/src/z3c/form/browser/README.txt	2009-02-03 20:49:14 UTC (rev 96049)
@@ -15,12 +15,10 @@
 
   >>> from zope.configuration import xmlconfig
   >>> import zope.component
-  >>> import zope.app.component
   >>> import zope.app.security
   >>> import zope.i18n
   >>> import z3c.form
   >>> xmlconfig.XMLConfig('meta.zcml', zope.component)()
-  >>> xmlconfig.XMLConfig('meta.zcml', zope.app.component)()
   >>> xmlconfig.XMLConfig('meta.zcml', zope.app.security)()
   >>> xmlconfig.XMLConfig('meta.zcml', zope.i18n)()
   >>> xmlconfig.XMLConfig('meta.zcml', z3c.form)()

Modified: z3c.form/trunk/src/z3c/form/browser/image.py
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/image.py	2009-02-03 20:23:05 UTC (rev 96048)
+++ z3c.form/trunk/src/z3c/form/browser/image.py	2009-02-03 20:49:14 UTC (rev 96049)
@@ -20,7 +20,7 @@
 import zope.interface
 import zope.traversing.api
 from zope.schema.fieldproperty import FieldProperty
-from zope.app.component import hooks
+from zope.site import hooks
 
 from z3c.form import interfaces
 from z3c.form.widget import FieldWidget

Modified: z3c.form/trunk/src/z3c/form/button.py
===================================================================
--- z3c.form/trunk/src/z3c/form/button.py	2009-02-03 20:23:05 UTC (rev 96048)
+++ z3c.form/trunk/src/z3c/form/button.py	2009-02-03 20:49:14 UTC (rev 96049)
@@ -23,7 +23,7 @@
 import zope.schema
 import zope.traversing.api
 
-from zope.app.component import hooks
+from zope.site import hooks
 from zope.interface import adapter
 from zope.schema.fieldproperty import FieldProperty
 from z3c.form import action, interfaces, util, value

Modified: z3c.form/trunk/src/z3c/form/group.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/group.txt	2009-02-03 20:23:05 UTC (rev 96048)
+++ z3c.form/trunk/src/z3c/form/group.txt	2009-02-03 20:49:14 UTC (rev 96049)
@@ -239,7 +239,7 @@
 
 Let's now successfully complete the add form.
 
-  >>> from zope.app.container import btree
+  >>> from zope.container import btree
   >>> context = btree.BTreeContainer()
 
   >>> request = testing.TestRequest(form={