[Checkins] SVN: grokui.admin/branches/baseplugin-0.6/src/grokui/admin/info.py * Display a message when a version of uninstalled package is requested

Uli Fouquet uli at gnufix.de
Fri Feb 26 18:11:47 EST 2010


Log message for revision 109478:
  * Display a message when a version of uninstalled package is requested
    instead of error.
  
    This might also help to stop unauthorized sniffing of what packages
    are installed at all.
  
  * Remove unusead getVersion from AdminInfo.
  

Changed:
  U   grokui.admin/branches/baseplugin-0.6/src/grokui/admin/info.py

-=-
Modified: grokui.admin/branches/baseplugin-0.6/src/grokui/admin/info.py
===================================================================
--- grokui.admin/branches/baseplugin-0.6/src/grokui/admin/info.py	2010-02-26 23:09:29 UTC (rev 109477)
+++ grokui.admin/branches/baseplugin-0.6/src/grokui/admin/info.py	2010-02-26 23:11:46 UTC (rev 109478)
@@ -17,13 +17,6 @@
     description = (u'This module allows you to create and'
                    u' manage your Grok applications.')
 
-    @property
-    def version(self):
-        return self.getVersion('grokui.admin')
-
-    def getVersion(self, pkg='grok'):
-        return u'%s %s' % (pkg, utilities.getVersion(pkg))
-
     def getSecurityNotes(self):
         notifier = queryUtility(ISecurityNotifier, default=None)
         if notifier is not None:
@@ -34,8 +27,7 @@
 class Version(grok.View):
     """Display version of a package.
 
-    Call this view via http://localhost:8080/@@admin/@@version to
-    get the used grok version. Call
+    Call this view via
     http://localhost:8080/++grokui++/++info++admin++/version?pkg=<pkgname>
     or http://localhost:8080/++grokui++/++info++admin++/version/<pkgname>
     to get the used version of package <pkgname>.
@@ -48,9 +40,13 @@
         return self
 
     def render(self, pkg='grok'):
-        return self.context.getVersion(pkg)
+        version = utilities.getVersion(pkg)
+        if version is None:
+            version = u'Not installed or namespace package.'
+        return u'%s %s' % (pkg, version)
 
 
+
 class SecurityNotes(grok.View):
     """Display current security notification.
 



More information about the checkins mailing list