Merge remote-tracking branch 'upstream/master' into Corni/loadfilescope

2017-12-22 16:07:51 -02:00
parent aedad85e35 efce50fe6a
commit 0d19e7f22b
11 changed files with 40 additions and 33 deletions
--- a/xdist/scheduler/loadscope.py
+++ b/xdist/scheduler/loadscope.py
@@ -1,14 +1,9 @@
-try:
-    from collections import OrderedDict
-except ImportError:
-    # Support for Python 2.6
-    from ordereddict import OrderedDict
+from collections import OrderedDict

-from py.log import Producer
 from _pytest.runner import CollectReport
-
-from xdist.slavemanage import parse_spec_config
+from py.log import Producer
 from xdist.report import report_collection_diff
+from xdist.slavemanage import parse_spec_config


 class LoadScopeScheduling: