[Checkins] SVN: megrok.z3cform.base/trunk/src/megrok/z3cform/base/ Changed imports to avoid components/directives name conflicts

[Souheil CHELFOUH]

Log message for revision 104854:
  Changed imports to avoid components/directives name conflicts

Changed:
  U   megrok.z3cform.base/trunk/src/megrok/z3cform/base/__init__.py
  U   megrok.z3cform.base/trunk/src/megrok/z3cform/base/handlers.py
  U   megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_button.py

-=-
Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/__init__.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/__init__.py	2009-10-07 11:25:31 UTC (rev 104853)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/__init__.py	2009-10-07 11:47:40 UTC (rev 104854)
@@ -8,7 +8,7 @@
 from z3c.form.interfaces import DISPLAY_MODE, INPUT_MODE
 
 # Public interface
+import directives
 from components import *
-from directives import *
 from interfaces import IGrokForm, ICancelButton
 from utils import apply_data_event, notify_changes, set_fields_data

Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/handlers.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/handlers.py	2009-10-07 11:25:31 UTC (rev 104853)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/handlers.py	2009-10-07 11:47:40 UTC (rev 104854)
@@ -1,17 +1,13 @@
 # -*- coding: utf-8 -*-
 
-"""
-z3c.form allows to define buttons as multi adapters, in order to have
-fully customizable forms.
-"""
 import grokcore.component as grok
 
 from zope.interface import Interface
 from zope.i18nmessageid import MessageFactory
 from zope.traversing.browser import AbsoluteURL
 
-from megrok.z3cform.base import button, IGrokForm
-from megrok.z3cform.base import cancellable, ICancelButton 
+from megrok.z3cform.base.directives import cancellable
+from megrok.z3cform.base import button, IGrokForm, ICancelButton
 
 _ = MessageFactory("megrok.z3cform")
 

Modified: megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_button.py
===================================================================
--- megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_button.py	2009-10-07 11:25:31 UTC (rev 104853)
+++ megrok.z3cform.base/trunk/src/megrok/z3cform/base/tests/test_button.py	2009-10-07 11:47:40 UTC (rev 104854)
@@ -31,7 +31,8 @@
 Now we create an Edit Form for the Person
 -----------------------------------------
 
-   >>> from megrok.z3cform.base import EditForm, Fields, cancellable
+   >>> from megrok.z3cform.base import EditForm, Fields
+   >>> from megrok.z3cform.base.directives import cancellable
    >>> from grokcore.component.testing import grok_component
    >>> from zope.component import getMultiAdapter
    >>> from zope.publisher.browser import TestRequest