[Zope3-checkins] CVS: Zope3/src/zope/app/applicationcontrol - zopeversion.py:1.1.2.3

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/app/applicationcontrol
In directory cvs.zope.org:/tmp/cvs-serv4150

Modified Files:
      Tag: NameGeddon-branch
	zopeversion.py 
Log Message:
- fix imports
- normalize whitespace


=== Zope3/src/zope/app/applicationcontrol/zopeversion.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/applicationcontrol/zopeversion.py:1.1.2.2	Tue Dec 24 07:50:45 2002
+++ Zope3/src/zope/app/applicationcontrol/zopeversion.py	Tue Dec 24 11:25:10 2002
@@ -15,9 +15,13 @@
 
 $Id$"""
 
-from zope.app.interfaces.applicationcontrol.zopeversion import IZopeVersion
 import os
 
+import zope
+
+from zope.app.interfaces.applicationcontrol.zopeversion import IZopeVersion
+
+
 class ZopeVersion:
 
     __implements__ =  IZopeVersion
@@ -27,34 +31,29 @@
         version_id = "Development/Unknown"
         version_tag = ""
         is_cvs = 0
-        
-        import Zope
+
         zopedir = os.path.dirname(zope.__file__)
-        
+
         # is this a CVS checkout?
         cvsdir = os.path.join(zopedir, "CVS" )
         if os.path.isdir(cvsdir):
             is_cvs = 1
             tagfile = os.path.join(cvsdir, "Tag")
-            
+
             # get the tag information
             if os.path.isfile(tagfile):
                 f = open(tagfile)
                 tag = f.read()
                 if tag.startswith("T"):
                     version_tag = " (%s)" % tag[1:-1]
-        
+
         # try to get official Zope release information
         versionfile = os.path.join(zopedir, "version.txt")
         if os.path.isfile(versionfile) and not is_cvs:
             f = open(versionfile)
             version_id = f.read().split("\n")[0] or version_id
-            
+
         version = "%s%s" % (version_id, version_tag)
         return version
 
-
-    #
-    ############################################################
-
-ZopeVersionUtility = ZopeVersion()    
+ZopeVersionUtility = ZopeVersion()