[Checkins] SVN: megrok.rdb/trunk/ upgrading to grok 1.2

[Christian Klinger]

Log message for revision 118764:
  upgrading to grok 1.2

Changed:
  U   megrok.rdb/trunk/buildout.cfg
  U   megrok.rdb/trunk/setup.py
  U   megrok.rdb/trunk/src/megrok/rdb/interfaces.py

-=-
Modified: megrok.rdb/trunk/buildout.cfg
===================================================================
--- megrok.rdb/trunk/buildout.cfg	2010-12-09 13:54:43 UTC (rev 118763)
+++ megrok.rdb/trunk/buildout.cfg	2010-12-09 14:12:05 UTC (rev 118764)
@@ -1,6 +1,6 @@
 [buildout]
 develop = .
-extends = http://grok.zope.org/releaseinfo/grok-1.0b2.cfg
+extends = http://grok.zope.org/releaseinfo/1.2/versions.cfg 
 versions = versions
 parts = test
 

Modified: megrok.rdb/trunk/setup.py
===================================================================
--- megrok.rdb/trunk/setup.py	2010-12-09 13:54:43 UTC (rev 118763)
+++ megrok.rdb/trunk/setup.py	2010-12-09 14:12:05 UTC (rev 118764)
@@ -39,8 +39,8 @@
           'zope.event',
           'zope.location',
           'grokcore.component',
-          'zope.app.container', # want to depend on zope.container directly but can't yet to retain grok compatibility
-          'martian < 0.12', # 0.12 is too new for grokcore.component right now..
+          'zope.container',
+          'martian',
           'SQLAlchemy > 0.5beta2',
           'zope.sqlalchemy',
           'z3c.saconfig >= 0.9',

Modified: megrok.rdb/trunk/src/megrok/rdb/interfaces.py
===================================================================
--- megrok.rdb/trunk/src/megrok/rdb/interfaces.py	2010-12-09 13:54:43 UTC (rev 118763)
+++ megrok.rdb/trunk/src/megrok/rdb/interfaces.py	2010-12-09 14:12:05 UTC (rev 118764)
@@ -1,6 +1,6 @@
 from zope.interface import Interface, Attribute, implements
 
-from zope.app.container.interfaces import IContainer as IContainerBase
+from zope.container.interfaces import IContainer as IContainerBase
 from grokcore.component.interfaces import IContext
 
 # FIXME: this doesn't depend on grok.interfaces.IContainer. If something
@@ -24,9 +24,11 @@
         Defined by SQLAlchemy dictionary-based collections.
         """
 
+
 class IDatabaseSetupEvent(Interface):
     metadata = Attribute("Metadata that was just set up")
 
+
 class DatabaseSetupEvent(object):
     implements(IDatabaseSetupEvent)