[Checkins] SVN: grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py Remove getGrokVersion() method (moved to utilities).

Uli Fouquet uli at gnufix.de
Sun Dec 21 19:23:15 EST 2008


Log message for revision 94237:
  Remove getGrokVersion() method (moved to utilities).

Changed:
  U   grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py

-=-
Modified: grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py
===================================================================
--- grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py	2008-12-22 00:21:59 UTC (rev 94236)
+++ grokui.admin/branches/ulif-securitynotifications/src/grokui/admin/security.py	2008-12-22 00:23:15 UTC (rev 94237)
@@ -16,7 +16,6 @@
 The machinery to do home-calling security notifications.
 """
 import grok
-import pkg_resources
 import time
 import urllib2
 import urlparse
@@ -25,6 +24,7 @@
 from zope.component import adapter, provideHandler
 from persistent import Persistent
 from grokui.admin.interfaces import ISecurityNotifier
+from grokui.admin.utilities import getGrokVersion
 
 class SecurityScreen(grok.ViewletManager):
     """A viewlet manager that keeps security related notifications.
@@ -116,7 +116,7 @@
         if self.enabled is False:
             # Safety belt.
             return
-        version = self.getGrokVersion()
+        version = getGrokVersion()
         filename = 'grok-%s.security.txt' % version
         url = urlparse.urljoin(self.lookup_url, filename)
         try:
@@ -140,14 +140,6 @@
         self.last_display = time.time()
         return
 
-    def getGrokVersion(self):
-        """Determine the version of grok used in background.
-        """
-        info = pkg_resources.get_distribution('grok')
-        if info.has_version and info.version:
-            return info.version
-        return None
-
 def setupSecurityNotification(site):
     """Setup a SecurityNotifier as persistent utility.
 



More information about the Checkins mailing list