From a4c17dfb19b1c1bfe1e380da72b1364f31cfd7a9 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 10 Oct 2013 11:56:12 -0400 Subject: Register the AssertionRewritingHook loader with pkg_resources; fixes #366. --- _pytest/assertion/rewrite.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to '_pytest') diff --git a/_pytest/assertion/rewrite.py b/_pytest/assertion/rewrite.py index f79698ae4..1f05fc51c 100644 --- a/_pytest/assertion/rewrite.py +++ b/_pytest/assertion/rewrite.py @@ -41,6 +41,7 @@ class AssertionRewritingHook(object): def __init__(self): self.session = None self.modules = {} + self._register_with_pkg_resources() def set_session(self, session): self.fnpats = session.config.getini("python_files") @@ -169,6 +170,23 @@ class AssertionRewritingHook(object): tp = desc[2] return tp == imp.PKG_DIRECTORY + @classmethod + def _register_with_pkg_resources(cls): + """ + Ensure package resources can be loaded from this loader. + """ + try: + pkg_resources = __import__('pkg_resources') + # access an attribute in case a deferred importer is present + pkg_resources.__name__ + except ImportError: + return + + # Since pytest tests are always located in the file system, the + # DefaultProvider is appropriate. + pkg_resources.register_loader_type(cls, pkg_resources.DefaultProvider) + + def _write_pyc(state, co, source_path, pyc): # Technically, we don't have to have the same pyc format as # (C)Python, since these "pycs" should never be seen by builtin -- cgit v1.2.3