[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/OFS/ApplicationControl - ApplicationControl.py:1.1.2.4 IApplicationControl.py:1.1.2.3 ZopeVersion.py:1.1.2.2

[Philipp von Weitershausen]

Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/ApplicationControl
In directory cvs.zope.org:/tmp/cvs-serv19261

Modified Files:
      Tag: Zope-3x-branch
	ApplicationControl.py IApplicationControl.py ZopeVersion.py 
Log Message:
Fixed doc string according to style guide lines


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/ApplicationControl.py 1.1.2.3 => 1.1.2.4 ===
 ##############################################################################
 __doc__ = """ Application Control
+
 $Id$"""
 
 from IApplicationControl import IApplicationControl


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/IApplicationControl.py 1.1.2.2 => 1.1.2.3 ===
 # 
 ##############################################################################
-__doc__ = """ Application Control
+__doc__ = """ Application Control Interface
+
 $Id$"""
 
 from Interface import Interface


=== Zope3/lib/python/Zope/App/OFS/ApplicationControl/ZopeVersion.py 1.1.2.1 => 1.1.2.2 ===
+#
+# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+__doc__ = """Zope version
+
+$Id$"""
+
 from Zope.App.OFS.ApplicationControl.IZopeVersion import IZopeVersion
 import os
 
@@ -36,7 +53,7 @@
         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]
+            version_id = f.read().split("\n")[0] or version_id
             
         version = "%s%s" % (version_id, version_tag)
         return version
@@ -44,3 +61,5 @@
 
     #
     ############################################################
+
+ZopeVersionUtility = ZopeVersion()