[Checkins] SVN: megrok.feeds/trunk/src/megrok/feeds/ Removed extraneous material left-over from experiments.

[Brandon Rhodes]

Log message for revision 88617:
  Removed extraneous material left-over from experiments.
  

Changed:
  U   megrok.feeds/trunk/src/megrok/feeds/components.py
  U   megrok.feeds/trunk/src/megrok/feeds/ftests/atom/atom.py
  U   megrok.feeds/trunk/src/megrok/feeds/meta.py
  U   megrok.feeds/trunk/src/megrok/feeds/meta.zcml

-=-
Modified: megrok.feeds/trunk/src/megrok/feeds/components.py
===================================================================
--- megrok.feeds/trunk/src/megrok/feeds/components.py	2008-07-19 20:24:21 UTC (rev 88616)
+++ megrok.feeds/trunk/src/megrok/feeds/components.py	2008-07-19 20:29:13 UTC (rev 88617)
@@ -1,6 +1,5 @@
 """Components for megrok.feeds.
 """
-import vice.outbound.core
 from vice.outbound.core.browser.feed import Atom_1_0_FeedView
 from zope.interface import Interface
 
@@ -9,4 +8,3 @@
 
 class AtomFeed(Atom_1_0_FeedView):
     pass
-    #grok.context(IFeedable)

Modified: megrok.feeds/trunk/src/megrok/feeds/ftests/atom/atom.py
===================================================================
--- megrok.feeds/trunk/src/megrok/feeds/ftests/atom/atom.py	2008-07-19 20:24:21 UTC (rev 88616)
+++ megrok.feeds/trunk/src/megrok/feeds/ftests/atom/atom.py	2008-07-19 20:29:13 UTC (rev 88617)
@@ -39,13 +39,10 @@
 """
 import grok
 from zope import schema
-from zope.interface import Interface, implements
 from zope.schema.fieldproperty import FieldProperty
 
 #
 
-#from megrok.feeds
-from vice.outbound.core.browser.feed import Atom_1_0_FeedView
 from vice.outbound.core.interfaces import IFeed, IFeedItem
 
 from zope.interface import Interface
@@ -57,14 +54,12 @@
 # (2) we need to mark MammothBox as IFeedable
 # (3) we need to create a View that makes an IFeedable render
 
-#
-
 class IMammoth(Interface):
     name = schema.TextLine(title=u"Name")
     size = schema.TextLine(title=u"Size", default=u"Quite normal")
 
 class MammothBox(object): #grok.Container): #grok.Application, #grok.Container
-    implements(IFeedable) #(2)
+    grok.implements(IFeedable) #(2)
 
 from datetime import datetime
 
@@ -95,19 +90,10 @@
 from megrok.feeds.components import AtomFeed
 
 class Atom(AtomFeed):
-    pass #grok.context(IFeedable)
+    pass
 
-#class AtomFormat(Atom_1_0_FeedView): #, grok.View):
-#    grok.context(IFeedable)
-
-
-from zope.component import provideAdapter
-from zope.publisher.interfaces.browser import IBrowserPage, IBrowserView
-from zope.publisher.interfaces.http import IHTTPRequest
-from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-
 class Mammoth(grok.Model):
-    implements(IMammoth)
+    grok.implements(IMammoth)
     
     name = FieldProperty(IMammoth['name'])    
     size = FieldProperty(IMammoth['size'])    

Modified: megrok.feeds/trunk/src/megrok/feeds/meta.py
===================================================================
--- megrok.feeds/trunk/src/megrok/feeds/meta.py	2008-07-19 20:24:21 UTC (rev 88616)
+++ megrok.feeds/trunk/src/megrok/feeds/meta.py	2008-07-19 20:29:13 UTC (rev 88617)
@@ -1,12 +1,11 @@
 """Grokkers for megrok.feeds components."""
 import grok
 import martian
-from zope import interface, component
+from grok import util
 from megrok.feeds import components
+from zope import interface, component
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
-from grok import util
-
 def default_view_name(factory, module=None, **data):
     return factory.__name__.lower()
 

Modified: megrok.feeds/trunk/src/megrok/feeds/meta.zcml
===================================================================
--- megrok.feeds/trunk/src/megrok/feeds/meta.zcml	2008-07-19 20:24:21 UTC (rev 88616)
+++ megrok.feeds/trunk/src/megrok/feeds/meta.zcml	2008-07-19 20:29:13 UTC (rev 88617)
@@ -3,8 +3,6 @@
     xmlns:meta="http://namespaces.zope.org/meta"
     xmlns:grok="http://namespaces.zope.org/grok">
 
-  <include package="z3c.autoinclude" file="meta.zcml" />
-  
     <!-- Load the grokkers -->
     <grok:grok package=".meta" />