diff options
| author | John Szakmeister <john@szakmeister.net> | 2015-08-18 04:39:20 -0400 |
|---|---|---|
| committer | John Szakmeister <john@szakmeister.net> | 2015-08-18 04:39:20 -0400 |
| commit | 716d822d43db30195f795daa9fd71d54e682ec0c (patch) | |
| tree | 3acded0eaf51a53da50255fb425e86270042c089 | |
| parent | 2f9ad566a0f3edc840cb0c93294b1662ea3206e4 (diff) | |
| parent | 2114cfbb6f6def804f16093588832daf010507d1 (diff) | |
| download | nose-716d822d43db30195f795daa9fd71d54e682ec0c.tar.gz | |
Merge pull request #937 from nwlunatic/master
fix 3rd party plugin override builtin plugin
| -rw-r--r-- | nose/plugins/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nose/plugins/manager.py b/nose/plugins/manager.py index 4d2ed22..04593f5 100644 --- a/nose/plugins/manager.py +++ b/nose/plugins/manager.py @@ -416,7 +416,7 @@ class BuiltinPluginManager(PluginManager): try: import pkg_resources - class DefaultPluginManager(EntryPointPluginManager, BuiltinPluginManager): + class DefaultPluginManager(BuiltinPluginManager, EntryPointPluginManager): pass except ImportError: |