[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/Forms/Views/Browser - Converter.py:1.4 FormView.py:1.11 Widget.py:1.8 configure.zcml:1.5

Jim Fulton jim@zope.com
Thu, 5 Sep 2002 14:55:32 -0400


Update of /cvs-repository/Zope3/lib/python/Zope/App/Forms/Views/Browser
In directory cvs.zope.org:/tmp/cvs-serv21741/lib/python/Zope/App/Forms/Views/Browser

Modified Files:
	Converter.py FormView.py Widget.py configure.zcml 
Log Message:
Moved the Schema package into the Zope package.

Also cleaned up a bunch of "from x import *".


=== Zope3/lib/python/Zope/App/Forms/Views/Browser/Converter.py 1.3 => 1.4 ===
--- Zope3/lib/python/Zope/App/Forms/Views/Browser/Converter.py:1.3	Wed Jul 24 06:53:48 2002
+++ Zope3/lib/python/Zope/App/Forms/Views/Browser/Converter.py	Thu Sep  5 14:55:01 2002
@@ -14,9 +14,7 @@
 """
 $Id$
 """
-from Zope.App.Forms.Converter import *
-from Schema.IField import *
-
+from Zope.App.Forms.Converter import Converter
 
 class NoneToEmptyListConverter(Converter):
     """Converts None object to an empty list."""


=== Zope3/lib/python/Zope/App/Forms/Views/Browser/FormView.py 1.10 => 1.11 ===
--- Zope3/lib/python/Zope/App/Forms/Views/Browser/FormView.py:1.10	Wed Sep  4 09:44:23 2002
+++ Zope3/lib/python/Zope/App/Forms/Views/Browser/FormView.py	Thu Sep  5 14:55:01 2002
@@ -14,10 +14,10 @@
 """
 $Id$
 """
-from Schema.IField import IField
-from Schema.Exceptions import StopValidation, ValidationError, \
+from Zope.Schema.IField import IField
+from Zope.Schema.Exceptions import StopValidation, ValidationError, \
      ConversionError, ValidationErrorsAll, ConversionErrorsAll
-from Schema import getFields, validateMappingAll
+from Zope.Schema import getFields, validateMappingAll
 #from Zope.Proxy.ContextWrapper import ContextWrapper
 from Zope.ComponentArchitecture import getView
 from Zope.Proxy.ProxyIntrospection import removeAllProxies


=== Zope3/lib/python/Zope/App/Forms/Views/Browser/Widget.py 1.7 => 1.8 ===
--- Zope3/lib/python/Zope/App/Forms/Views/Browser/Widget.py:1.7	Wed Sep  4 09:44:23 2002
+++ Zope3/lib/python/Zope/App/Forms/Views/Browser/Widget.py	Thu Sep  5 14:55:01 2002
@@ -16,7 +16,7 @@
 """
 from types import ListType, TupleType
 ListTypes = (ListType, TupleType)
-from Schema import Converter
+from Zope.Schema import Converter
 from Zope.ComponentArchitecture import getAdapter
 from Zope.Proxy.ProxyIntrospection import removeAllProxies
 from Zope.Publisher.Browser.BrowserView import BrowserView


=== Zope3/lib/python/Zope/App/Forms/Views/Browser/configure.zcml 1.4 => 1.5 ===
--- Zope3/lib/python/Zope/App/Forms/Views/Browser/configure.zcml:1.4	Wed Jul 17 14:43:41 2002
+++ Zope3/lib/python/Zope/App/Forms/Views/Browser/configure.zcml	Thu Sep  5 14:55:01 2002
@@ -7,37 +7,37 @@
   <!-- Form Widget View Directives -->
   <browser:view
       permission="Zope.View"
-      for="Schema.IField.IStr"
+      for="Zope.Schema.IField.IStr"
       name="widget"
       factory=".Widget.TextWidget." />
 
   <browser:view
       permission="Zope.View"
-      for="Schema.IField.IInt"
+      for="Zope.Schema.IField.IInt"
       name="widget"
       factory=".Widget.TextWidget." />
 
   <browser:view
       permission="Zope.View"
-      for="Schema.IField.IFloat"
+      for="Zope.Schema.IField.IFloat"
       name="widget"
       factory=".Widget.TextWidget." />
 
   <browser:view
       permission="Zope.View"
-      for="Schema.IField.IBool"
+      for="Zope.Schema.IField.IBool"
       name="widget"
       factory=".Widget.CheckBoxWidget." />
 
   <browser:view
       permission="Zope.View"
-      for="Schema.IField.ITuple"
+      for="Zope.Schema.IField.ITuple"
       name="widget"
       factory=".Widget.TextAreaWidget." />
 
   <browser:view
       permission="Zope.View"
-      for="Schema.IField.IList"
+      for="Zope.Schema.IField.IList"
       name="widget"
       factory=".Widget.TextAreaWidget." />