[Checkins] SVN: zc.sourcefactory/trunk/ removed zope.app.form dependency. Changed ITerms import

[Roger Ineichen]

Log message for revision 93872:
  removed zope.app.form dependency. Changed ITerms import
  from zope.app.form.browser.interfaces to zope.browser.interfaces
  
  TODO:
  can someone with commit privilege review and release this changes?
  Till we do not have a release, the zope.app.form package
  notifies deprecation warnings because it uses this package
  for test setup in zope.app.form.testing.AppFormLayerd

Changed:
  U   zc.sourcefactory/trunk/CHANGES.txt
  U   zc.sourcefactory/trunk/setup.py
  _U  zc.sourcefactory/trunk/src/
  U   zc.sourcefactory/trunk/src/zc/sourcefactory/browser/README.txt
  U   zc.sourcefactory/trunk/src/zc/sourcefactory/browser/mapping.py
  U   zc.sourcefactory/trunk/src/zc/sourcefactory/browser/source.py

-=-
Modified: zc.sourcefactory/trunk/CHANGES.txt
===================================================================
--- zc.sourcefactory/trunk/CHANGES.txt	2008-12-11 03:41:01 UTC (rev 93871)
+++ zc.sourcefactory/trunk/CHANGES.txt	2008-12-11 04:02:42 UTC (rev 93872)
@@ -5,7 +5,8 @@
 0.3.6 (unreleased)
 ==================
 
-    - 
+    - removed zope.app.form dependency. Changed ITerms import
+      from zope.app.form.browser.interfaces to zope.browser.interfaces
 
 
 0.3.5 (2008-12-08)

Modified: zc.sourcefactory/trunk/setup.py
===================================================================
--- zc.sourcefactory/trunk/setup.py	2008-12-11 03:41:01 UTC (rev 93871)
+++ zc.sourcefactory/trunk/setup.py	2008-12-11 04:02:42 UTC (rev 93872)
@@ -43,7 +43,6 @@
     install_requires=[
         "setuptools",
         "ZODB3",
-        "zope.app.form",
         "zope.app.intid",
         "zope.component",
         "zope.dublincore",


Property changes on: zc.sourcefactory/trunk/src
___________________________________________________________________
Added: svn:ignore
   + zc.sourcefactory.egg-info


Modified: zc.sourcefactory/trunk/src/zc/sourcefactory/browser/README.txt
===================================================================
--- zc.sourcefactory/trunk/src/zc/sourcefactory/browser/README.txt	2008-12-11 03:41:01 UTC (rev 93871)
+++ zc.sourcefactory/trunk/src/zc/sourcefactory/browser/README.txt	2008-12-11 04:02:42 UTC (rev 93872)
@@ -22,11 +22,11 @@
 We need a request first, then we can adapt the source to ITerms:
 
   >>> from zope.publisher.browser import TestRequest
-  >>> import zope.app.form.browser.interfaces
+  >>> import zope.browser.interfaces
   >>> import zope.component
   >>> request = TestRequest()
   >>> terms = zope.component.getMultiAdapter(
-  ...     (source, request), zope.app.form.browser.interfaces.ITerms)
+  ...     (source, request), zope.browser.interfaces.ITerms)
   >>> terms
   <zc.sourcefactory.browser.source.FactoredTerms object at 0x...>
 
@@ -89,7 +89,7 @@
   ...         return 'Custom title ' + value.custom_title
   >>> source2 = DemoSourceWithTitles()
   >>> terms2 = zope.component.getMultiAdapter(
-  ...     (source2, request), zope.app.form.browser.interfaces.ITerms)
+  ...     (source2, request), zope.browser.interfaces.ITerms)
   >>> o1 = MyObject()
   >>> o1.custom_title = u"Object one"
   >>> o2 = MyObject()
@@ -123,7 +123,7 @@
 
   >>> source3 = DemoSourceWithTokens()
   >>> terms3 = zope.component.getMultiAdapter(
-  ...     (source3, request), zope.app.form.browser.interfaces.ITerms)
+  ...     (source3, request), zope.browser.interfaces.ITerms)
 
   >>> terms3.getTerm(o1).token
   'one'
@@ -170,7 +170,7 @@
 Let's look at the terms:
 
   >>> terms = zope.component.getMultiAdapter(
-  ...     (source, request), zope.app.form.browser.interfaces.ITerms)
+  ...     (source, request), zope.browser.interfaces.ITerms)
   >>> terms
   <zc.sourcefactory.browser.source.FactoredContextualTerms object at 0x...>
 

Modified: zc.sourcefactory/trunk/src/zc/sourcefactory/browser/mapping.py
===================================================================
--- zc.sourcefactory/trunk/src/zc/sourcefactory/browser/mapping.py	2008-12-11 03:41:01 UTC (rev 93871)
+++ zc.sourcefactory/trunk/src/zc/sourcefactory/browser/mapping.py	2008-12-11 04:02:42 UTC (rev 93872)
@@ -20,10 +20,9 @@
 import zope.proxy
 import zope.interface
 import zope.component
+import zope.browser
 import zope.publisher.interfaces.browser
 
-import zope.app.form.browser.interfaces
-
 import zc.sourcefactory.mapping
 
 
@@ -32,14 +31,14 @@
     created through a source factory.
     """
 
-    zope.interface.implements(zope.app.form.browser.interfaces.ITerms)
+    zope.interface.implements(zope.browser.interfaces.ITerms)
 
     zope.component.adapts(zc.sourcefactory.mapping.ValueMappingSource,
         zope.publisher.interfaces.browser.IBrowserRequest)
 
     def __init__(self, source, request):
         self.base = zope.component.getMultiAdapter(
-            [source.base, request], zope.app.form.browser.interfaces.ITerms)
+            [source.base, request], zope.browser.interfaces.ITerms)
         self.source = source
         self.request = request
 

Modified: zc.sourcefactory/trunk/src/zc/sourcefactory/browser/source.py
===================================================================
--- zc.sourcefactory/trunk/src/zc/sourcefactory/browser/source.py	2008-12-11 03:41:01 UTC (rev 93871)
+++ zc.sourcefactory/trunk/src/zc/sourcefactory/browser/source.py	2008-12-11 04:02:42 UTC (rev 93872)
@@ -19,11 +19,10 @@
 
 import zope.interface
 import zope.component
+import zope.browser.interfaces
 import zope.publisher.interfaces.browser
 import zope.schema.interfaces
 
-import zope.app.form.browser.interfaces
-
 import zc.sourcefactory.source
 
 
@@ -32,7 +31,7 @@
     created through a source factory.
     """
 
-    zope.interface.implements(zope.app.form.browser.interfaces.ITerms)
+    zope.interface.implements(zope.browser.interfaces.ITerms)
 
     zope.component.adapts(
         zc.sourcefactory.source.FactoredSource,