SVN: r25353 - in trunk/quixote: . demo form

Author: nascheme
Date: 2004-10-14 15:12:22 -0400 (Thu, 14 Oct 2004)
New Revision: 25353

Added:
   trunk/quixote/form/
Removed:
   trunk/quixote/form2/
Modified:
   trunk/quixote/demo/forms.ptl
   trunk/quixote/form/__init__.py
   trunk/quixote/form/compatibility.py
   trunk/quixote/form/form.py
   trunk/quixote/setup.py
Log:
Rename 'form2' to 'form'.


Modified: trunk/quixote/demo/forms.ptl
===================================================================
--- trunk/quixote/demo/forms.ptl	2004-10-14 19:10:35 UTC (rev 25352)
+++ trunk/quixote/demo/forms.ptl	2004-10-14 19:12:22 UTC (rev 25353)
@@ -6,10 +6,10 @@
 
 
 import time
-from quixote.form2 import Form, StringWidget, PasswordWidget, \
+from quixote.form import Form, StringWidget, PasswordWidget, \
      RadiobuttonsWidget, SingleSelectWidget, MultipleSelectWidget, \
      CheckboxWidget
-from quixote.form2.css import BASIC_FORM_CSS
+from quixote.form.css import BASIC_FORM_CSS
 
 class Topping:
     def __init__(self, name, cost):

Copied: trunk/quixote/form (from rev 25351, trunk/quixote/form2)

Modified: trunk/quixote/form/__init__.py
===================================================================
--- trunk/quixote/form2/__init__.py	2004-10-14 19:06:43 UTC (rev 25351)
+++ trunk/quixote/form/__init__.py	2004-10-14 19:12:22 UTC (rev 25353)
@@ -9,8 +9,8 @@
 and/or composing the standard widget classes.
 """
 
-from quixote.form2.form import Form, FormTokenWidget
-from quixote.form2.widget import Widget, StringWidget, FileWidget, \
+from quixote.form.form import Form, FormTokenWidget
+from quixote.form.widget import Widget, StringWidget, FileWidget, \
     PasswordWidget, TextWidget, CheckboxWidget, RadiobuttonsWidget, \
     SingleSelectWidget, SelectWidget, OptionSelectWidget, \
     MultipleSelectWidget, SubmitWidget, HiddenWidget, \

Modified: trunk/quixote/form/compatibility.py
===================================================================
--- trunk/quixote/form2/compatibility.py	2004-10-14 19:06:43 UTC (rev 25351)
+++ trunk/quixote/form/compatibility.py	2004-10-14 19:12:22 UTC (rev 25353)
@@ -5,7 +5,7 @@
 class (useful for transitioning existing forms).
 '''
 
-from quixote.form2 import Form as _Form, Widget, StringWidget, FileWidget, \
+from quixote.form import Form as _Form, Widget, StringWidget, FileWidget, \
     PasswordWidget, TextWidget, CheckboxWidget, RadiobuttonsWidget, \
     SingleSelectWidget, SelectWidget, OptionSelectWidget, \
     MultipleSelectWidget, SubmitWidget, HiddenWidget, \

Modified: trunk/quixote/form/form.py
===================================================================
--- trunk/quixote/form2/form.py	2004-10-14 19:06:43 UTC (rev 25351)
+++ trunk/quixote/form/form.py	2004-10-14 19:12:22 UTC (rev 25353)
@@ -7,7 +7,7 @@
 
 from quixote import get_request, get_session, get_publisher
 from quixote.html import url_quote, htmltag, htmltext, TemplateIO
-from quixote.form2.widget import HiddenWidget, StringWidget, TextWidget, \
+from quixote.form.widget import HiddenWidget, StringWidget, TextWidget, \
     CheckboxWidget, SingleSelectWidget, RadiobuttonsWidget, \
     MultipleSelectWidget, ResetWidget, SubmitWidget, FloatWidget, \
     IntWidget

Modified: trunk/quixote/setup.py
===================================================================
--- trunk/quixote/setup.py	2004-10-14 19:10:35 UTC (rev 25352)
+++ trunk/quixote/setup.py	2004-10-14 19:12:22 UTC (rev 25353)
@@ -29,7 +29,7 @@
 
       'package_dir': {'quixote':os.curdir},
       'packages': ['quixote',  'quixote.demo', 'quixote.form',
-                   'quixote.form2', 'quixote.server'],
+                   'quixote.server'],
 
       'ext_modules': [],