#79: don't swallow App.FindHomes exceptions

28e6af93 · Matt Behrens · df07a42e · 28e6af93 · 28e6af93 · 28e6af93
Commit 28e6af93 authored Jun 20, 2002 by Matt Behrens
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

ZServer/__init__.py ZServer/__init__.py +2 -1

doc/CHANGES.txt doc/CHANGES.txt +2 -0

lib/python/ZServer/__init__.py lib/python/ZServer/__init__.py +2 -1

No files found.
--- a/ZServer/__init__.py
+++ b/ZServer/__init__.py
@@ -33,8 +33,9 @@ from medusa.test import max_sockets
 CONNECTION_LIMIT=max_sockets.max_select_sockets()

 ZSERVER_VERSION='1.1b1'
+import App.FindHomes
 try:
-    import App.version_txt, App.FindHomes
+    import App.version_txt
    ZOPE_VERSION=App.version_txt.version_txt()
 except:
    ZOPE_VERSION='experimental'

--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -19,6 +19,8 @@ Zope Changes
      - Collector #72: Start on Windows 95 machines with no network
        devices installed.

+      - Collector #79: Don't swallow App.FindHomes exceptions.
+
  Zope 2.6.0 alpha 1

    Features Added

--- a/lib/python/ZServer/__init__.py
+++ b/lib/python/ZServer/__init__.py
@@ -33,8 +33,9 @@ from medusa.test import max_sockets
 CONNECTION_LIMIT=max_sockets.max_select_sockets()

 ZSERVER_VERSION='1.1b1'
+import App.FindHomes
 try:
-    import App.version_txt, App.FindHomes
+    import App.version_txt
    ZOPE_VERSION=App.version_txt.version_txt()
 except:
    ZOPE_VERSION='experimental'