[Checkins] SVN: zc.extrinsicreference/trunk/s Fix the errors introduced in previous refactoring.

[Zvezdan Petkovic]

Log message for revision 103301:
  Fix the errors introduced in previous refactoring.
  
  1. The extrinsicreference.py file was moved to __init__.py in 0.2.0 tag.
     Stop referring to it from ZCML.
  2. The handlers referred to from track_shortcuts.zcml were moved to
     class methods in 0.2.0 tag.
     Move them back to module functions so that they can be still used as
     handlers.
  3. Once 0.2.0 tag was released the trunk should have been marked with a
     new release number.  Marking it 0.3.0dev.
  4. Add the required dependency and remove the one that's not needed.
  
  

Changed:
  U   zc.extrinsicreference/trunk/setup.py
  U   zc.extrinsicreference/trunk/src/zc/extrinsicreference/__init__.py
  U   zc.extrinsicreference/trunk/src/zc/extrinsicreference/configure.zcml

-=-
Modified: zc.extrinsicreference/trunk/setup.py
===================================================================
--- zc.extrinsicreference/trunk/setup.py	2009-08-27 16:04:30 UTC (rev 103300)
+++ zc.extrinsicreference/trunk/setup.py	2009-08-27 16:16:26 UTC (rev 103301)
@@ -2,7 +2,7 @@
 
 setup(
     name="zc.extrinsicreference",
-    version = "0.2.0dev",
+    version = "0.3.0dev",
     license = 'ZPL 2.1',
     description = '',
     author = 'Zope Corporation and Contributors',
@@ -16,8 +16,8 @@
         'setuptools',
         'zc.shortcut',
         'zope.app.keyreference',
+        'zope.component',
         'zope.interface',
-        'zope.location',
         'zope.testing',
         ],
     zip_safe = False

Modified: zc.extrinsicreference/trunk/src/zc/extrinsicreference/__init__.py
===================================================================
--- zc.extrinsicreference/trunk/src/zc/extrinsicreference/__init__.py	2009-08-27 16:04:30 UTC (rev 103300)
+++ zc.extrinsicreference/trunk/src/zc/extrinsicreference/__init__.py	2009-08-27 16:16:26 UTC (rev 103301)
@@ -89,19 +89,17 @@
         for kr in refs:
             yield kr()
 
-    @property
-    def shortcut_registry(self):
-        return zope.component.queryUtility(
-            zc.extrinsicreference.interfaces.IExtrinsicReferences, 'shortcuts')
 
-    def registerShortcut(shortcut, event):
-        """Subscriber to add an extrinsic reference."""
-        if self.shortcut_registry is not None:
-            # We use raw_target because we don't want a proxy.
-            registry.add(shortcut.raw_target, shortcut)
+def registerShortcut(shortcut, event):
+    """Subscriber to add an extrinsic reference."""
+    registry = zope.component.queryUtility(IExtrinsicReferences, 'shortcuts')
+    if registry is not None:
+        # We use raw_target because we don't want a proxy.
+        registry.add(shortcut.raw_target, shortcut)
 
-    def unregisterShortcut(shortcut, event):
-        """Subscriber to remove an extrinsic reference."""
-        if self.shortcut_registry is not None:
-            # We use raw_target because we don't want a proxy.
-            registry.discard(shortcut.raw_target, shortcut)
+def unregisterShortcut(shortcut, event):
+    """Subscriber to remove an extrinsic reference."""
+    registry = zope.component.queryUtility(IExtrinsicReferences, 'shortcuts')
+    if registry is not None:
+        # We use raw_target because we don't want a proxy.
+        registry.discard(shortcut.raw_target, shortcut)

Modified: zc.extrinsicreference/trunk/src/zc/extrinsicreference/configure.zcml
===================================================================
--- zc.extrinsicreference/trunk/src/zc/extrinsicreference/configure.zcml	2009-08-27 16:04:30 UTC (rev 103300)
+++ zc.extrinsicreference/trunk/src/zc/extrinsicreference/configure.zcml	2009-08-27 16:16:26 UTC (rev 103301)
@@ -3,12 +3,12 @@
     xmlns:browser='http://namespaces.zope.org/browser'
     i18n_domain="zc.intranet">
 
-  <class class=".extrinsicreference.ExtrinsicReferences">
+  <class class=".ExtrinsicReferences">
     <implements interface="zope.annotation.interfaces.IAttributeAnnotatable"/>
   </class>
 
   <browser:addMenuItem
-      class=".extrinsicreference.ExtrinsicReferences"
+      class=".ExtrinsicReferences"
       title="Extrinsic References"
       permission= "zope.ManageContent"
   />