[Checkins] SVN: zope3org/trunk/src/zorg/ Remove live package from default configuration and fixed other minor problems.

[Uwe Oestermeier]

Log message for revision 70888:
  Remove live package from default configuration and fixed other minor problems.

Changed:
  U   zope3org/trunk/src/zorg/configure.zcml
  U   zope3org/trunk/src/zorg/kupusupport/sample/configure.zcml
  U   zope3org/trunk/src/zorg/restsupport/__init__.py
  U   zope3org/trunk/src/zorg/table/container/form.py
  U   zope3org/trunk/src/zorg/wikification/browser/wikilink.py

-=-
Modified: zope3org/trunk/src/zorg/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/configure.zcml	2006-10-23 11:43:06 UTC (rev 70887)
+++ zope3org/trunk/src/zorg/configure.zcml	2006-10-23 13:11:20 UTC (rev 70888)
@@ -10,7 +10,11 @@
   <include package=".live" />
   <include package=".wikification" />
   <include package=".importer" />
+  
+  <!-- 
   <include package=".live" />
+  
+  -->
   <include package=".kupusupport" />
   <include package=".tinymcesupport" />
  

Modified: zope3org/trunk/src/zorg/kupusupport/sample/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/kupusupport/sample/configure.zcml	2006-10-23 11:43:06 UTC (rev 70887)
+++ zope3org/trunk/src/zorg/kupusupport/sample/configure.zcml	2006-10-23 13:11:20 UTC (rev 70888)
@@ -5,7 +5,7 @@
   <class class=".app.KupuSample">
 
     <implements 
-        interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
+        interface="zope.annotation.interfaces.IAttributeAnnotatable" />
 
     <implements 
         interface="kupusupport.interfaces.IKupuEditable" />

Modified: zope3org/trunk/src/zorg/restsupport/__init__.py
===================================================================
--- zope3org/trunk/src/zorg/restsupport/__init__.py	2006-10-23 11:43:06 UTC (rev 70887)
+++ zope3org/trunk/src/zorg/restsupport/__init__.py	2006-10-23 13:11:20 UTC (rev 70888)
@@ -19,6 +19,9 @@
 from zope.app.renderer.rest import ReStructuredTextToHTMLRenderer
 from zope.app.renderer.rest import ZopeTranslator
 
+from docutils.parsers.rst.directives import misc
+del misc.raw
+del misc.include;
 
 from zorg.restsupport.html2rest import Html2ReStructuredTextParser
 

Modified: zope3org/trunk/src/zorg/table/container/form.py
===================================================================
--- zope3org/trunk/src/zorg/table/container/form.py	2006-10-23 11:43:06 UTC (rev 70887)
+++ zope3org/trunk/src/zorg/table/container/form.py	2006-10-23 13:11:20 UTC (rev 70888)
@@ -7,7 +7,7 @@
 
 from zope.event import notify
 from zope.security.interfaces import Unauthorized
-from zope.exception.interfaces import UserError
+from zope.exceptions.interfaces import UserError
 from zope.traversing.interfaces import TraversalError
 
 from zope.app import zapi

Modified: zope3org/trunk/src/zorg/wikification/browser/wikilink.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/wikilink.py	2006-10-23 11:43:06 UTC (rev 70887)
+++ zope3org/trunk/src/zorg/wikification/browser/wikilink.py	2006-10-23 13:11:20 UTC (rev 70888)
@@ -162,7 +162,7 @@
                '''
 
     _email = r'''(?:mailto:)?            # Optional mailto:
-                    ([-\+\w]+               # username
+                    ([-\+\w\.]+               # username
                     \@                      # at
                     [-\w]+(?:\.\w[-\w]*)+)  # hostname
                  '''