[Checkins] SVN: zope3org/trunk/src/zorg/ Make zorg at least start up on Zope 3.3: Message instead of MessageID.

[Philipp von Weitershausen]

Log message for revision 68947:
  Make zorg at least start up on Zope 3.3: Message instead of MessageID.
  

Changed:
  U   zope3org/trunk/src/zorg/ajax/interfaces.py
  U   zope3org/trunk/src/zorg/live/page/interfaces.py
  U   zope3org/trunk/src/zorg/wikification/browser/interfaces.py
  U   zope3org/trunk/src/zorg/wikification/browser/wikilink.py
  U   zope3org/trunk/src/zorg/wikification/browser/wikipage.py

-=-
Modified: zope3org/trunk/src/zorg/ajax/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/ajax/interfaces.py	2006-07-02 12:19:16 UTC (rev 68946)
+++ zope3org/trunk/src/zorg/ajax/interfaces.py	2006-07-02 12:40:19 UTC (rev 68947)
@@ -24,11 +24,9 @@
 from zope.schema import Bytes, BytesLine
 
 from zope.app.container.interfaces import IContainer
-from zope.i18n import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("zorg.ajax")
 
-
-_ = MessageIDFactory("zorg.ajax")
-
                 
 class IAjaxPage(Interface) :
     """ A web page that contains Ajax calls.
@@ -96,4 +94,4 @@
     
 class ILivePageClient(Interface) :
     """ The server side internal representation of a livepage client. """
-    
\ No newline at end of file
+    

Modified: zope3org/trunk/src/zorg/live/page/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/live/page/interfaces.py	2006-07-02 12:19:16 UTC (rev 68946)
+++ zope3org/trunk/src/zorg/live/page/interfaces.py	2006-07-02 12:40:19 UTC (rev 68947)
@@ -24,11 +24,11 @@
 from zope.schema import Bytes, BytesLine
 
 from zope.app.container.interfaces import IContainer
-from zope.i18n import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
 
 from zorg.ajax.interfaces import IAjaxPage
 
-_ = MessageIDFactory("zorg.live")
+_ = MessageFactory("zorg.live")
 
 class ILivePageEvent(Interface) :
     """ LivePage events are broadcasted from server side LivePage clients
@@ -240,4 +240,4 @@
     
 class ILivePageClient(Interface) :
     """ The server side internal representation of a livepage client. """
-    
\ No newline at end of file
+    

Modified: zope3org/trunk/src/zorg/wikification/browser/interfaces.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/interfaces.py	2006-07-02 12:19:16 UTC (rev 68946)
+++ zope3org/trunk/src/zorg/wikification/browser/interfaces.py	2006-07-02 12:40:19 UTC (rev 68947)
@@ -19,11 +19,8 @@
 
 from zope.interface import Interface
 from zope.interface import Attribute
-
-from zope.i18n import MessageIDFactory
-
-
-_ = MessageIDFactory("zorg.wikification")
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("zorg.wikification")
           
 
 class ILinkProcessor(Interface) :
@@ -56,4 +53,4 @@
     """ Edit view for a file. """
 
 class ICreateWikiPage(IWikiPage) :
-    """ Edit view for a folder. """
\ No newline at end of file
+    """ Edit view for a folder. """

Modified: zope3org/trunk/src/zorg/wikification/browser/wikilink.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/wikilink.py	2006-07-02 12:19:16 UTC (rev 68946)
+++ zope3org/trunk/src/zorg/wikification/browser/wikilink.py	2006-07-02 12:40:19 UTC (rev 68947)
@@ -20,11 +20,11 @@
 import re, urllib, cgi, os
 
 import zope
+import zope.contenttype
 
 from zope.interface import implements
 from zope.component import adapts
 from zope.app import zapi
-from zope.app import contenttypes
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.dublincore.interfaces import IZopeDublinCore
 from zope.app.file import File
@@ -784,7 +784,7 @@
         name = filename or self.page.parameter('name')
 
         if not contenttype :
-            contenttype = contenttypes.guess_content_type(filename)[0]
+            contenttype = zope.contenttype.guess_content_type(filename)[0]
 
         if data is None :
             data = ''

Modified: zope3org/trunk/src/zorg/wikification/browser/wikipage.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/wikipage.py	2006-07-02 12:19:16 UTC (rev 68946)
+++ zope3org/trunk/src/zorg/wikification/browser/wikipage.py	2006-07-02 12:40:19 UTC (rev 68947)
@@ -36,9 +36,9 @@
 from zope.security.interfaces import ForbiddenAttribute
 
 from zope.publisher.browser import TestRequest
-from zope.i18n import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
 
-_ = MessageIDFactory("zorg.wikification")
+_ = MessageFactory("zorg.wikification")
 
 from persistent import Persistent