Rename the brain files again to avoid naming conflicts.

11 files changed, 23 insertions, 1 deletions

diff --git a/astroid/brain/_builtin_inference.py b/astroid/brain/brain_builtin_inference.py
index c6245bea..c6245bea 100644
--- a/astroid/brain/_builtin_inference.py
+++ b/astroid/brain/brain_builtin_inference.py
diff --git a/astroid/brain/_dateutil.py b/astroid/brain/brain_dateutil.py
index 0b45412c..0b45412c 100644
--- a/astroid/brain/_dateutil.py
+++ b/astroid/brain/brain_dateutil.py
diff --git a/astroid/brain/_gi.py b/astroid/brain/brain_gi.py
index f8acb428..f8acb428 100644
--- a/astroid/brain/_gi.py
+++ b/astroid/brain/brain_gi.py
diff --git a/astroid/brain/_mechanize.py b/astroid/brain/brain_mechanize.py
index 20a253a4..20a253a4 100644
--- a/astroid/brain/_mechanize.py
+++ b/astroid/brain/brain_mechanize.py
diff --git a/astroid/brain/_nose.py b/astroid/brain/brain_nose.py
index 9a37f4e1..9a37f4e1 100644
--- a/astroid/brain/_nose.py
+++ b/astroid/brain/brain_nose.py
diff --git a/astroid/brain/_numpy.py b/astroid/brain/brain_numpy.py
index 75f4f18f..75f4f18f 100644
--- a/astroid/brain/_numpy.py
+++ b/astroid/brain/brain_numpy.py
diff --git a/astroid/brain/_pytest.py b/astroid/brain/brain_pytest.py
index 8165a2ed..4f615c14 100644
--- a/astroid/brain/_pytest.py
+++ b/astroid/brain/brain_pytest.py
@@ -1,5 +1,5 @@
 """Astroid hooks for pytest."""

-

+from __future__ import absolute_import

 from astroid import MANAGER, register_module_extender

 from astroid.builder import AstroidBuilder

 

diff --git a/astroid/brain/_qt.py b/astroid/brain/brain_qt.py
index f568b65f..f568b65f 100644
--- a/astroid/brain/_qt.py
+++ b/astroid/brain/brain_qt.py
diff --git a/astroid/brain/_six.py b/astroid/brain/brain_six.py
index a1043ea5..a1043ea5 100644
--- a/astroid/brain/_six.py
+++ b/astroid/brain/brain_six.py
diff --git a/astroid/brain/_stdlib.py b/astroid/brain/brain_stdlib.py
index 51265d6b..51265d6b 100644
--- a/astroid/brain/_stdlib.py
+++ b/astroid/brain/brain_stdlib.py
diff --git a/astroid/tests/unittest_brain.py b/astroid/tests/unittest_brain.py
index 861fab23..cb354624 100644
--- a/astroid/tests/unittest_brain.py
+++ b/astroid/tests/unittest_brain.py
@@ -59,6 +59,12 @@ try:
 except ImportError:
     HAS_NUMPY = False
 
+try:
+    import pytest # pylint: disable=unused-import
+    HAS_PYTEST = True
+except ImportError:
+    HAS_PYTEST = False
+
 
 class HashlibTest(unittest.TestCase):
     def test_hashlib(self):
@@ -450,5 +456,21 @@ class NumpyBrainTest(unittest.TestCase):
         self.assertIsInstance(inferred, nodes.FunctionDef)
 
 
+@unittest.skipUnless(HAS_PYTEST, "This test requires the pytest library.")
+class PytestBrainTest(unittest.TestCase):
+
+    def test_pytest(self):
+        ast_node = test_utils.extract_node('''
+        import pytest
+        pytest #@
+        ''')
+        module = next(ast_node.infer())
+        self.assertIn('deprecated_call', module)
+        self.assertIn('exit', module)
+        self.assertIn('fail', module)
+        self.assertIn('fixture', module)
+        self.assertIn('mark', module)
+
+
 if __name__ == '__main__':
     unittest.main()