[Checkins] SVN: martian/trunk/ Ignore __main__ modules.

[Sylvain Viollon]

Log message for revision 114957:
  Ignore __main__ modules.
  

Changed:
  U   martian/trunk/CHANGES.txt
  U   martian/trunk/src/martian/scan.py
  U   martian/trunk/src/martian/scan.txt
  A   martian/trunk/src/martian/tests/with__main__/
  A   martian/trunk/src/martian/tests/with__main__/__init__.py
  A   martian/trunk/src/martian/tests/with__main__/__main__.py
  A   martian/trunk/src/martian/tests/with__main__/package.py

-=-
Modified: martian/trunk/CHANGES.txt
===================================================================
--- martian/trunk/CHANGES.txt	2010-07-23 12:11:36 UTC (rev 114956)
+++ martian/trunk/CHANGES.txt	2010-07-23 12:34:10 UTC (rev 114957)
@@ -4,9 +4,12 @@
 0.13 (unreleased)
 =================
 
-- Nothing changed yet.
+Feature changes
+---------------
 
+* Ignore all __main__ modules.
 
+
 0.12 (2009-06-29)
 =================
 

Modified: martian/trunk/src/martian/scan.py
===================================================================
--- martian/trunk/src/martian/scan.py	2010-07-23 12:11:36 UTC (rev 114956)
+++ martian/trunk/src/martian/scan.py	2010-07-23 12:34:10 UTC (rev 114957)
@@ -83,7 +83,7 @@
             entry_path = os.path.join(directory, entry)
             name, ext = os.path.splitext(entry)
             dotted_name = self.dotted_name + '.' + name
-            if self.exclude_filter(name):
+            if self.exclude_filter(name) or name == '__main__':
                 continue
             if self.ignore_nonsource:
                 if ext in ['.pyo', '.pyc']:

Modified: martian/trunk/src/martian/scan.txt
===================================================================
--- martian/trunk/src/martian/scan.txt	2010-07-23 12:11:36 UTC (rev 114956)
+++ martian/trunk/src/martian/scan.txt	2010-07-23 12:34:10 UTC (rev 114957)
@@ -197,6 +197,14 @@
   >>> print module_info.getSubModuleInfos()
   [<ModuleInfo object for 'martian.tests.withtestsmodules.subpackage'>]
 
+By default __main__ packages are always ignored::
+
+  >>> module_info = module_info_from_dotted_name(
+  ...     'martian.tests.with__main__')
+  >>> print module_info.getSubModuleInfos()
+  [<ModuleInfo object for 'martian.tests.with__main__.package'>]
+
+
 Non-modules that look like modules
 ----------------------------------
 

Added: martian/trunk/src/martian/tests/with__main__/__init__.py
===================================================================
--- martian/trunk/src/martian/tests/with__main__/__init__.py	                        (rev 0)
+++ martian/trunk/src/martian/tests/with__main__/__init__.py	2010-07-23 12:34:10 UTC (rev 114957)
@@ -0,0 +1 @@
+# this is a package

Added: martian/trunk/src/martian/tests/with__main__/__main__.py
===================================================================
--- martian/trunk/src/martian/tests/with__main__/__main__.py	                        (rev 0)
+++ martian/trunk/src/martian/tests/with__main__/__main__.py	2010-07-23 12:34:10 UTC (rev 114957)
@@ -0,0 +1,6 @@
+
+def main():
+    print "Hello"
+
+main()
+

Added: martian/trunk/src/martian/tests/with__main__/package.py
===================================================================
--- martian/trunk/src/martian/tests/with__main__/package.py	                        (rev 0)
+++ martian/trunk/src/martian/tests/with__main__/package.py	2010-07-23 12:34:10 UTC (rev 114957)
@@ -0,0 +1,3 @@
+
+class Package(object):
+    pass


Property changes on: martian/trunk/src/martian/tests/with__main__/package.py
___________________________________________________________________
Added: svn:mergeinfo
   +