[Checkins] SVN: zope3org/trunk/src/zorg/ Removed deprecated code

Uwe Oestermeier uwe_oestermeier at iwm-kmrc.de
Fri Apr 7 03:32:11 EDT 2006


Log message for revision 66629:
  Removed deprecated code

Changed:
  U   zope3org/trunk/src/zorg/ajax/configure.zcml
  U   zope3org/trunk/src/zorg/comment/configure.zcml
  U   zope3org/trunk/src/zorg/edition/configure.zcml
  U   zope3org/trunk/src/zorg/edition/demo/configure.zcml
  U   zope3org/trunk/src/zorg/kupusupport/configure.zcml
  U   zope3org/trunk/src/zorg/kupusupport/sample/configure.zcml
  U   zope3org/trunk/src/zorg/wikification/browser/wikilink.py
  U   zope3org/trunk/src/zorg/wikification/browser/wikipage.py

-=-
Modified: zope3org/trunk/src/zorg/ajax/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/ajax/configure.zcml	2006-04-06 22:39:48 UTC (rev 66628)
+++ zope3org/trunk/src/zorg/ajax/configure.zcml	2006-04-07 07:32:09 UTC (rev 66629)
@@ -55,22 +55,22 @@
   
   
  
-  <zope:content class="zorg.ajax.livepage.IterBuffer">
+  <zope:class class="zorg.ajax.livepage.IterBuffer">
     
 	<require
 		permission="zope.Public"
 		attributes="next __iter__"/>   
 			
-  </zope:content>
+  </zope:class>
   
 
- <zope:content class="twisted.web2.wsgi.FileWrapper">
+ <zope:class class="twisted.web2.wsgi.FileWrapper">
     
 	<require
 		permission="zope.Public"
 		attributes="next __iter__"/>   
 			
-  </zope:content>
+  </zope:class>
   
   
   <zope:subscriber

Modified: zope3org/trunk/src/zorg/comment/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/comment/configure.zcml	2006-04-06 22:39:48 UTC (rev 66628)
+++ zope3org/trunk/src/zorg/comment/configure.zcml	2006-04-07 07:32:09 UTC (rev 66629)
@@ -3,7 +3,7 @@
   i18n_domain="zope">
 
   <!-- comment -->
-  <content class=".comments.Comment">
+  <class class=".comments.Comment">
     <factory id="comment.interfaces.IComment" />
     <implements 
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable"
@@ -16,7 +16,7 @@
         permission="zope.ManageContent"
         set_schema=".IComment"
         />
-  </content>
+  </class>
 
 
   <!-- comments -->
@@ -44,18 +44,18 @@
         />
   </class>
   
-  <content class="zope.app.file.File">
+  <class class="zope.app.file.File">
     <implements 
         interface="zorg.comment.IAttributeAnnotableComments"
         />
         
-  </content>
+  </class>
 
-  <content class="zope.app.folder.Folder">
+  <class class="zope.app.folder.Folder">
     <implements 
         interface="zorg.comment.IAttributeAnnotableComments"
         />
-  </content>
+  </class>
   
   <adapter
       provides=".IComments"

Modified: zope3org/trunk/src/zorg/edition/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/edition/configure.zcml	2006-04-06 22:39:48 UTC (rev 66628)
+++ zope3org/trunk/src/zorg/edition/configure.zcml	2006-04-07 07:32:09 UTC (rev 66629)
@@ -60,41 +60,41 @@
   <include package=".browser" />
 
 
-  <content class="zorg.edition.storage.SimpleHistoryStorage">
+  <class class="zorg.edition.storage.SimpleHistoryStorage">
    
     <require
 			permission="zope.ManageSite"
 			interface="zorg.edition.interfaces.IHistoryStorage"/>
         
-  </content>  
+  </class>  
   
-  <content class="zorg.edition.storage.VersionHistory">
+  <class class="zorg.edition.storage.VersionHistory">
    
     <require
 			permission="zope.ManageSite"
 			interface="zorg.edition.interfaces.IVersionHistory"/>
         
-  </content> 
+  </class> 
   
         
-  <content class="buddydemo.buddy.Buddy">
+  <class class="buddydemo.buddy.Buddy">
      <implements 
          interface=".interfaces.IVersionable" />
-  </content>      
+  </class>      
   
-  <content class="zope.app.file.File">
+  <class class="zope.app.file.File">
      <implements 
          interface=".interfaces.IVersionable" />
-  </content>     
+  </class>     
   
-  <content class="zope.app.folder.Folder">
+  <class class="zope.app.folder.Folder">
      <implements 
          interface=".interfaces.IVersionable" />
-  </content>  
+  </class>  
   
-  <content class="zorg.edition.demo.vproposal.VProposal">
+  <class class="zorg.edition.demo.vproposal.VProposal">
      <implements 
          interface=".interfaces.IVersionable" />
-  </content>     
+  </class>     
           
 </configure>

Modified: zope3org/trunk/src/zorg/edition/demo/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/edition/demo/configure.zcml	2006-04-06 22:39:48 UTC (rev 66628)
+++ zope3org/trunk/src/zorg/edition/demo/configure.zcml	2006-04-07 07:32:09 UTC (rev 66629)
@@ -5,17 +5,17 @@
     xmlns:i18n="http://namespaces.zope.org/i18n"
     >
 
-<i18n:registerTranslations directory="locales" />
+  <i18n:registerTranslations directory="locales" />
+  
+  <include package=".browser" /> 
+  
+  <class class=".vproposal.VProposal">
+    <implements interface="zope.app.annotation.IAttributeAnnotatable"/>  
+    <require permission="zope.View"
+             interface=".interfaces.IVProposal" />
+    <require permission="zope.ManageContent"
+             set_schema=".interfaces.IVProposal" />
+  </class>
 
-<include package=".browser" /> 
 
-<content class=".vproposal.VProposal">
-  <implements interface="zope.app.annotation.IAttributeAnnotatable"/>  
-  <require permission="zope.View"
-           interface=".interfaces.IVProposal" />
-  <require permission="zope.ManageContent"
-           set_schema=".interfaces.IVProposal" />
-</content>
-
-
 </configure> 
\ No newline at end of file

Modified: zope3org/trunk/src/zorg/kupusupport/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/kupusupport/configure.zcml	2006-04-06 22:39:48 UTC (rev 66628)
+++ zope3org/trunk/src/zorg/kupusupport/configure.zcml	2006-04-07 07:32:09 UTC (rev 66629)
@@ -2,11 +2,11 @@
     xmlns="http://namespaces.zope.org/zope">
 
 
-  <content class="zope.app.file.File">
+  <class class="zope.app.file.File">
     <implements 
         interface="zorg.kupusupport.interfaces.IKupuEditable"
         />
-  </content>
+  </class>
 
   <adapter
 	  factory="zorg.kupusupport.adapters.KupuEditableFile"

Modified: zope3org/trunk/src/zorg/kupusupport/sample/configure.zcml
===================================================================
--- zope3org/trunk/src/zorg/kupusupport/sample/configure.zcml	2006-04-06 22:39:48 UTC (rev 66628)
+++ zope3org/trunk/src/zorg/kupusupport/sample/configure.zcml	2006-04-07 07:32:09 UTC (rev 66629)
@@ -2,7 +2,7 @@
     xmlns="http://namespaces.zope.org/zope">
 
  <!-- sample content -->
-  <content class=".app.KupuSample">
+  <class class=".app.KupuSample">
 
     <implements 
         interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
@@ -29,7 +29,7 @@
         interface="zope.app.container.interfaces.IWriteContainer"
         />
 
-  </content>
+  </class>
 
   <adapter
       factory=".adapters.KupuSamplePolicy"

Modified: zope3org/trunk/src/zorg/wikification/browser/wikilink.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/wikilink.py	2006-04-06 22:39:48 UTC (rev 66628)
+++ zope3org/trunk/src/zorg/wikification/browser/wikilink.py	2006-04-07 07:32:09 UTC (rev 66629)
@@ -491,6 +491,11 @@
         
         zope.event.notify(ObjectCreatedEvent(obj))
         
+        scope = self.page.parameter('scope')
+        scope_checked = scope and scope.lower() == 'on'
+        
+        import pdb; pdb.set_trace()
+        
         container = self.page.container
         chooser = INameChooser(container)
         name = chooser.chooseName(name, obj)
@@ -551,9 +556,22 @@
         return self._addObject(name, Folder())
     
 
-class CreatePagePlaceholder(Placeholder) :
-    pass
+class CreatePagePlaceholder(AddObjectPlaceholder) :
+    """ A placeholder for a new single page. Note that this command only
+        changes the reference of the clicked link. Thus you can have
+        several links with the same name and different URLs.
+    """
+                
+    def addObject(self) :
+        """ Create a page. Returns the name of the new page.
+        """
+        
+        label = self.editableLabel()
+        contenttype = "text/html"
+        name = self.page.parameter('name')
+        return self._addObject(name, File(u'New Page', contenttype))
 
+
 class NoopPlaceholder(Placeholder) :
     """ An unmodified placeholder. """
     

Modified: zope3org/trunk/src/zorg/wikification/browser/wikipage.py
===================================================================
--- zope3org/trunk/src/zorg/wikification/browser/wikipage.py	2006-04-06 22:39:48 UTC (rev 66628)
+++ zope3org/trunk/src/zorg/wikification/browser/wikipage.py	2006-04-07 07:32:09 UTC (rev 66629)
@@ -533,7 +533,6 @@
         self._modifyLink('upload', link_id)
         self.request.response.redirect(self.nextURL())
         
-        
     def modifyLink(self, cmd, link_id, verbose=True) :
         """ Modify a single link dynamically and return the new
             body.



More information about the Checkins mailing list