[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py Merged rev 26959.

[Stephan Richter]

Log message for revision 26961:
  Merged rev 26959.
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py	2004-08-09 15:59:34 UTC (rev 26960)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/apidoc/classmodule/__init__.py	2004-08-09 16:21:11 UTC (rev 26961)
@@ -152,10 +152,12 @@
     soon as you have the object::
 
       >>> keys = module.keys()
-      >>> keys.sort()
-      >>> keys[:5]
-      ['APIDocumentation', 'apidocNamespace', 'browser', 'classmodule', """ \
-          """'handleNamespace']
+      >>> 'APIDocumentation' in keys
+      True
+      >>> 'apidocNamespace' in keys
+      True
+      >>> 'handleNamespace' in keys
+      True
 
       >>> print module['browser'].getPath()
       zope.app.apidoc.browser
@@ -193,7 +195,8 @@
         # Detect packages
         if hasattr(self.__module, '__file__') and \
                (self.__module.__file__.endswith('__init__.py') or
-                self.__module.__file__.endswith('__init__.pyc')):
+                self.__module.__file__.endswith('__init__.pyc')or
+                self.__module.__file__.endswith('__init__.pyo')):
             dir = os.path.split(self.__module.__file__)[0]
             for file in os.listdir(dir):
                 if file in IGNORE_FILES: