rpms/python-twisted-core/FC-6 python-twisted-core.spec, 1.2, 1.3 twisted-dropin-cache, 1.1, 1.2

[Thomas Vander Stichele (thomasvs)]

Author: thomasvs

Update of /cvs/extras/rpms/python-twisted-core/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4117

Modified Files:
	python-twisted-core.spec twisted-dropin-cache 
Log Message:
new twisted-dropin-cache


Index: python-twisted-core.spec
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-core/FC-6/python-twisted-core.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-twisted-core.spec	19 Dec 2006 14:22:29 -0000	1.2
+++ python-twisted-core.spec	26 Dec 2006 15:00:12 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           %{python}-twisted-core
 Version:        2.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        An asynchronous networking framework written in Python
 
 Group:          Development/Libraries
@@ -188,6 +188,11 @@
 %{_datadir}/zsh/site-functions/_twisted_zsh_stub
 
 %changelog
+* Tue Dec 26 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.4.0-6
+- new twisted-dropin-cache; does not complain loudly about plugins in
+  the cache that are no longer installed
+
 * Tue Nov 07 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 2.4.0-5
 - incorporate suggestions by Paul Howarth:


Index: twisted-dropin-cache
===================================================================
RCS file: /cvs/extras/rpms/python-twisted-core/FC-6/twisted-dropin-cache,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- twisted-dropin-cache	15 Nov 2006 12:05:21 -0000	1.1
+++ twisted-dropin-cache	26 Dec 2006 15:00:12 -0000	1.2
@@ -5,8 +5,29 @@
 # this program regenerates the dropin.cache file for twisted,
 # or for the modules specified on the command line
 
+# we copy and adapt getPlugins from there because getPlugins does log.err()
+# on *any* exception, giving us a full traceback every time a plug-in has
+# gone away
+
 import sys
-from twisted.plugin import IPlugin, getPlugins
+from twisted.plugin import IPlugin, getCache
+import twisted.plugins
+
+def getPlugins(interface, package=twisted.plugins):
+    allDropins = getCache(package)
+    for dropin in allDropins.itervalues():
+        for plugin in dropin.plugins:
+            try:
+                adapted = interface(plugin, None)
+            except AttributeError:
+                # this is most likely due to a module in the cache that
+                # has now gone away, so ignore it
+                pass
+            except:
+                log.err()
+            else:
+                if adapted is not None:
+                    yield adapted
 
 which = None
 if len(sys.argv) > 1: