[Checkins] SVN: megrok.icon/trunk/s No longer using zc.dict

[Souheil CHELFOUH]

Log message for revision 107448:
  No longer using zc.dict
  Removed unused imports
  

Changed:
  U   megrok.icon/trunk/setup.py
  U   megrok.icon/trunk/src/megrok/icon/configure.zcml
  U   megrok.icon/trunk/src/megrok/icon/registry.py
  U   megrok.icon/trunk/src/megrok/icon/tests/test_readme.py

-=-
Modified: megrok.icon/trunk/setup.py
===================================================================
--- megrok.icon/trunk/setup.py	2009-12-31 13:56:52 UTC (rev 107447)
+++ megrok.icon/trunk/setup.py	2009-12-31 15:15:15 UTC (rev 107448)
@@ -10,18 +10,26 @@
 
 
 install_requires = [
+    'grokcore.component',
+    'grokcore.view',
     'martian',
     'setuptools',
-    'grokcore.view',
-    'grokcore.component',
-    'zc.dict',
+    'zope.browserresource',
+    'zope.component',
+    'zope.container',
+    'zope.interface',
+    'zope.location',
+    'zope.publisher',
+    'zope.schema',
+    'zope.security',
+    'zope.site',
+    'zope.traversing',
     ]
 
 tests_require = [
+    'zope.testing',
     'zope.testbrowser',
     'zope.app.testing',
-    'zope.browserresource',
-    'zope.configuration',
     'zope.app.zcmlfiles',
     ]
 

Modified: megrok.icon/trunk/src/megrok/icon/configure.zcml
===================================================================
--- megrok.icon/trunk/src/megrok/icon/configure.zcml	2009-12-31 13:56:52 UTC (rev 107447)
+++ megrok.icon/trunk/src/megrok/icon/configure.zcml	2009-12-31 15:15:15 UTC (rev 107448)
@@ -3,7 +3,6 @@
     xmlns:grok="http://namespaces.zope.org/grok">
 
   <include package="grokcore.component" file="meta.zcml" />
-  <include package="zope.browserresource" />
   <grok:grok package=".traversal" />
 
 </configure>

Modified: megrok.icon/trunk/src/megrok/icon/registry.py
===================================================================
--- megrok.icon/trunk/src/megrok/icon/registry.py	2009-12-31 13:56:52 UTC (rev 107447)
+++ megrok.icon/trunk/src/megrok/icon/registry.py	2009-12-31 15:15:15 UTC (rev 107448)
@@ -5,8 +5,6 @@
 from grokcore import view, component as grok
 from megrok.icon import log, ICONS_BASES
 from megrok.icon.interfaces import IIcon, IIconRegistry, IIconRegistryStorage
-from zc.dict import Dict
-from zope.interface import directlyProvides
 from zope.schema.fieldproperty import FieldProperty
 from zope.security.checker import NamesChecker
 from zope.browserresource.file import FileResourceFactory
@@ -25,6 +23,10 @@
         self.path = path
 
 
+class IconStorage(dict):
+    grok.implements(IIconRegistryStorage)
+
+
 class IconRegistry(grok.GlobalUtility):
     grok.baseclass()
     grok.implements(IIconRegistry)
@@ -33,8 +35,7 @@
     registry = FieldProperty(IIconRegistry['registry'])
 
     def _generate_registry(self):
-        registry = Dict()
-        directlyProvides(registry, IIconRegistryStorage)
+        registry = IconStorage()
         return registry
 
     def add(self, name, path):

Modified: megrok.icon/trunk/src/megrok/icon/tests/test_readme.py
===================================================================
--- megrok.icon/trunk/src/megrok/icon/tests/test_readme.py	2009-12-31 13:56:52 UTC (rev 107447)
+++ megrok.icon/trunk/src/megrok/icon/tests/test_readme.py	2009-12-31 15:15:15 UTC (rev 107448)
@@ -1,6 +1,6 @@
 import os.path
 import unittest
-from zope.testing import doctest, module
+from zope.testing import module
 from zope.app.testing import functional
 from grokcore.component.testing import grok_component