[Checkins] SVN: martian/branches/0.11/ - Update version number.

[Christian Theune]

Log message for revision 104733:
  - Update version number.
  - Backport fix for recursively applying `exclude_filter`.
  

Changed:
  U   martian/branches/0.11/CHANGES.txt
  U   martian/branches/0.11/setup.py
  U   martian/branches/0.11/src/martian/scan.py
  U   martian/branches/0.11/src/martian/scan.txt
  A   martian/branches/0.11/src/martian/tests/withtestsmodules/subpackage/tests.py

-=-
Modified: martian/branches/0.11/CHANGES.txt
===================================================================
--- martian/branches/0.11/CHANGES.txt	2009-10-02 08:32:58 UTC (rev 104732)
+++ martian/branches/0.11/CHANGES.txt	2009-10-02 08:47:44 UTC (rev 104733)
@@ -1,6 +1,15 @@
 CHANGES
 *******
 
+0.11.1 (unreleased)
+===================
+
+Bug fixes
+---------
+
+* Backported fix for correctly applying `exclude_filter` recursively for
+  sub-modules.
+
 0.11 (2008-09-24)
 =================
 

Modified: martian/branches/0.11/setup.py
===================================================================
--- martian/branches/0.11/setup.py	2009-10-02 08:32:58 UTC (rev 104732)
+++ martian/branches/0.11/setup.py	2009-10-02 08:47:44 UTC (rev 104733)
@@ -17,7 +17,7 @@
 
 setup(
     name='martian',
-    version='0.11',
+    version='0.11.1dev',
     author='Grok project',
     author_email='grok-dev at zope.org',
     description="""\

Modified: martian/branches/0.11/src/martian/scan.py
===================================================================
--- martian/branches/0.11/src/martian/scan.py	2009-10-02 08:32:58 UTC (rev 104732)
+++ martian/branches/0.11/src/martian/scan.py	2009-10-02 08:47:44 UTC (rev 104733)
@@ -85,24 +85,28 @@
                 if name in seen:
                     continue
                 seen.append(name)
-                module_infos.append(ModuleInfo(entry_path, dotted_name))
+                module_infos.append(ModuleInfo(entry_path, dotted_name,
+                                               exclude_filter=self.exclude_filter))
             # Case two: packages
             elif is_package(entry_path):
                 # We can blindly use __init__.py even if only
                 # __init__.pyc exists because we never actually use
                 # that filename.
                 module_infos.append(ModuleInfo(
-                    os.path.join(entry_path, '__init__.py'), dotted_name))
+                    os.path.join(entry_path, '__init__.py'), dotted_name,
+                                 exclude_filter=self.exclude_filter))
         return module_infos
 
     def getSubModuleInfo(self, name):
         path = os.path.join(os.path.dirname(self.path), name)
         if is_package(path):
             return ModuleInfo(os.path.join(path, '__init__.py'),
-                              '%s.%s' % (self.package_dotted_name, name))
+                              '%s.%s' % (self.package_dotted_name, name),
+                              exclude_filter=self.exclude_filter)
         elif os.path.isfile(path + '.py') or os.path.isfile(path + '.pyc'):
                 return ModuleInfo(path + '.py',
-                                  '%s.%s' % (self.package_dotted_name, name))
+                                  '%s.%s' % (self.package_dotted_name, name),
+                                  exclude_filter=self.exclude_filter)
         else:
             return None
 

Modified: martian/branches/0.11/src/martian/scan.txt
===================================================================
--- martian/branches/0.11/src/martian/scan.txt	2009-10-02 08:32:58 UTC (rev 104732)
+++ martian/branches/0.11/src/martian/scan.txt	2009-10-02 08:47:44 UTC (rev 104733)
@@ -194,6 +194,8 @@
   >>> module_info
   <ModuleInfo object for 'martian.tests.withtestsmodules'>
   >>> no_tests_filter = lambda x: x in ['tests', 'ftests']
-  >>> print module_info.getSubModuleInfos()
+  >>> submodules = module_info.getSubModuleInfos()
+  >>> print submodules
   [<ModuleInfo object for 'martian.tests.withtestsmodules.subpackage'>]
-
+  >>> print submodules[0].getSubModuleInfos()
+  []

Added: martian/branches/0.11/src/martian/tests/withtestsmodules/subpackage/tests.py
===================================================================
--- martian/branches/0.11/src/martian/tests/withtestsmodules/subpackage/tests.py	                        (rev 0)
+++ martian/branches/0.11/src/martian/tests/withtestsmodules/subpackage/tests.py	2009-10-02 08:47:44 UTC (rev 104733)
@@ -0,0 +1,3 @@
+import unittest
+def test_suite():
+    return unittest.TestSuite() # return an empty suite


Property changes on: martian/branches/0.11/src/martian/tests/withtestsmodules/subpackage/tests.py
___________________________________________________________________
Added: svn:eol-style
   + native