[py-svn] commit/pytest: hpk42: avoid double-instantiation of PluginManager in case of the "python pytest.py" or -m pytest invocation

[Bitbucket]

1 new commit in pytest:


https://bitbucket.org/hpk42/pytest/changeset/d46b4480e6de/
changeset:   d46b4480e6de
user:        hpk42
date:        2012-09-25 11:58:41
summary:     avoid double-instantiation of PluginManager in case of the "python pytest.py" or -m pytest invocation
affected #:  1 file

diff -r a25a79906b2ec440cb9033172bd4b318b875518c -r d46b4480e6de290d9b965618981f9f186030380f pytest.py
--- a/pytest.py
+++ b/pytest.py
@@ -1,13 +1,15 @@
 """
-unit and functional testing with Python.
+pytest: unit and functional testing with Python.
 """
 __all__ = ['main']
 
-from _pytest.core import main, UsageError, _preloadplugins
-from _pytest import core as cmdline
-from _pytest import __version__
-
 if __name__ == '__main__': # if run as a script or by 'python -m pytest'
-    raise SystemExit(main())
+    # we trigger the below "else" condition by the following import
+    import pytest
+    raise SystemExit(pytest.main())
 else:
+    # we are simply imported
+    from _pytest.core import main, UsageError, _preloadplugins
+    from _pytest import core as cmdline
+    from _pytest import __version__
     _preloadplugins() # to populate pytest.* namespace so help(pytest) works

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.