replace usages of py.log

Author: asottile

changelog/822.trivial.rst

@@ -0,0 +1 @@
+Replace internal usage of ``py.log``.

src/xdist/dsession.py

@@ -1,4 +1,6 @@
-import py
+import functools
+import sys
+
 import pytest
 
 from xdist.workermanage import NodeManager
@@ -34,9 +36,10 @@ class DSession:
 
     def __init__(self, config):
         self.config = config
-        self.log = py.log.Producer("dsession")
-        if not config.option.debug:
-            py.log.setconsumer(self.log._keywords, None)
+        if config.option.debug:
+            self.log = functools.partial(print, file=sys.stderr)
+        else:
+            self.log = lambda *a, **k: None
         self.nodemanager = None
         self.sched = None
         self.shuttingdown = False

src/xdist/remote.py

@@ -6,11 +6,11 @@
     needs not to be installed in remote environments.
 """
 
+import functools
 import sys
 import os
 import time
 
-import py
 import pytest
 from execnet.gateway_base import dumps, DumpError
 
@@ -37,9 +37,10 @@ def __init__(self, config, channel):
         self.config = config
         self.workerid = config.workerinput.get("workerid", "?")
         self.testrunuid = config.workerinput["testrunuid"]
-        self.log = py.log.Producer("worker-%s" % self.workerid)
-        if not config.option.debug:
-            py.log.setconsumer(self.log._keywords, None)
+        if config.option.debug:
+            self.log = functools.partial(print, file=sys.stderr)
+        else:
+            self.log = lambda *a, **k: None
         self.channel = channel
         config.pluginmanager.register(self)
 

src/xdist/scheduler/each.py

@@ -1,4 +1,5 @@
-from py.log import Producer
+import functools
+import sys
 
 from xdist.workermanage import parse_spec_config
 from xdist.report import report_collection_diff
@@ -26,9 +27,9 @@ def __init__(self, config, log=None):
         self._started = []
         self._removed2pending = {}
         if log is None:
-            self.log = Producer("eachsched")
+            self.log = functools.partial(print, file=sys.stderr)
         else:
-            self.log = log.eachsched
+            self.log = log
         self.collection_is_completed = False
 
     @property

src/xdist/scheduler/load.py

@@ -1,6 +1,7 @@
+import functools
+import sys
 from itertools import cycle
 
-from py.log import Producer
 from _pytest.runner import CollectReport
 
 from xdist.workermanage import parse_spec_config
@@ -60,9 +61,9 @@ def __init__(self, config, log=None):
         self.pending = []
         self.collection = None
         if log is None:
-            self.log = Producer("loadsched")
+            self.log = functools.partial(print, file=sys.stderr)
         else:
-            self.log = log.loadsched
+            self.log = log
         self.config = config
 
     @property

src/xdist/scheduler/loadfile.py

@@ -1,5 +1,7 @@
+import functools
+import sys
+
 from .loadscope import LoadScopeScheduling
-from py.log import Producer
 
 
 class LoadFileScheduling(LoadScopeScheduling):
@@ -23,9 +25,9 @@ class LoadFileScheduling(LoadScopeScheduling):
     def __init__(self, config, log=None):
         super().__init__(config, log)
         if log is None:
-            self.log = Producer("loadfilesched")
+            self.log = functools.partial(print, file=sys.stderr)
         else:
-            self.log = log.loadfilesched
+            self.log = log
 
     def _split_scope(self, nodeid):
         """Determine the scope (grouping) of a nodeid.

src/xdist/scheduler/loadgroup.py

@@ -1,5 +1,7 @@
+import functools
+import sys
+
 from .loadscope import LoadScopeScheduling
-from py.log import Producer
 
 
 class LoadGroupScheduling(LoadScopeScheduling):
@@ -12,9 +14,9 @@ class LoadGroupScheduling(LoadScopeScheduling):
     def __init__(self, config, log=None):
         super().__init__(config, log)
         if log is None:
-            self.log = Producer("loadgroupsched")
+            self.log = functools.partial(print, file=sys.stderr)
         else:
-            self.log = log.loadgroupsched
+            self.log = log
 
     def _split_scope(self, nodeid):
         """Determine the scope (grouping) of a nodeid.

src/xdist/scheduler/loadscope.py

@@ -1,7 +1,8 @@
+import functools
+import sys
 from collections import OrderedDict
 
 from _pytest.runner import CollectReport
-from py.log import Producer
 from xdist.report import report_collection_diff
 from xdist.workermanage import parse_spec_config
 
@@ -93,9 +94,9 @@ def __init__(self, config, log=None):
         self.registered_collections = OrderedDict()
 
         if log is None:
-            self.log = Producer("loadscopesched")
+            self.log = functools.partial(print, file=sys.stderr)
         else:
-            self.log = log.loadscopesched
+            self.log = log
 
         self.config = config
 

src/xdist/workermanage.py

@@ -1,4 +1,5 @@
 import fnmatch
+import functools
 import os
 import re
 import sys
@@ -101,7 +102,7 @@ def get_dir(p):
         pytestpath = get_dir(pytest.__file__)
         pytestdir = get_dir(_pytest.__file__)
         config = self.config
-        candidates = [py._pydir, pytestpath, pytestdir]
+        candidates = [pytestpath, pytestdir]
         candidates += config.option.rsyncdir
         rsyncroots = config.getini("rsyncdirs")
         if rsyncroots:
@@ -230,9 +231,10 @@ def __init__(self, nodemanager, gateway, config, putevent):
         }
         self._down = False
         self._shutdown_sent = False
-        self.log = py.log.Producer("workerctl-%s" % gateway.id)
-        if not self.config.option.debug:
-            py.log.setconsumer(self.log._keywords, None)
+        if self.config.option.debug:
+            self.log = functools.partial(print, file=sys.stderr)
+        else:
+            self.log = lambda *a, **k: None
 
     def __repr__(self):
         return "<{} {}>".format(self.__class__.__name__, self.gateway.id)