[Zope-Checkins] CVS: Zope/lib/python/Zope/Startup - __init__.py:1.2.2.10

Fred L. Drake, Jr. fred@zope.com
Mon, 24 Feb 2003 17:30:19 -0500


Update of /cvs-repository/Zope/lib/python/Zope/Startup
In directory cvs.zope.org:/tmp/cvs-serv14875

Modified Files:
      Tag: new-install-branch
	__init__.py 
Log Message:
- delay import until it's actually needed
- add ZPL blurb


=== Zope/lib/python/Zope/Startup/__init__.py 1.2.2.9 => 1.2.2.10 ===
--- Zope/lib/python/Zope/Startup/__init__.py:1.2.2.9	Mon Feb 24 17:20:25 2003
+++ Zope/lib/python/Zope/Startup/__init__.py	Mon Feb 24 17:30:18 2003
@@ -1,3 +1,17 @@
+##############################################################################
+#
+# Copyright (c) 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.
+#
+##############################################################################
+
 """ Startup package.  Responsible for startup configuration of Zope """
 
 import os
@@ -7,7 +21,6 @@
 
 import ZConfig
 
-from misc.lock_file import lock_file
 from cmdline import getOptions, getOptionDescriptions # exported
 
 # global to hold config structures
@@ -108,6 +121,7 @@
         # if we can't lock it.
         # we need a separate lock file because on win32, locks are not
         # advisory, otherwise we would just use the pid file
+        from Zope.Startup.misc.lock_file import lock_file
         lock_filename = cfg.lock_filename
         try:
             if os.path.exists(lock_filename):