summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2015-10-28 15:27:44 +0200
committerClaudiu Popa <pcmanticore@gmail.com>2015-10-28 15:27:44 +0200
commitdf2d0adc86de5136fcbf68d9b9273bf4483114dc (patch)
tree78371fcdd6dcc0f82ae577644a2ce27834ba7a1b
parentfe65e50e2e1aec846cc6aee263218bc5e698154f (diff)
downloadastroid-df2d0adc86de5136fcbf68d9b9273bf4483114dc.tar.gz
Rename the brain files again to avoid naming conflicts.
-rw-r--r--astroid/brain/brain_builtin_inference.py (renamed from astroid/brain/_builtin_inference.py)0
-rw-r--r--astroid/brain/brain_dateutil.py (renamed from astroid/brain/_dateutil.py)0
-rw-r--r--astroid/brain/brain_gi.py (renamed from astroid/brain/_gi.py)0
-rw-r--r--astroid/brain/brain_mechanize.py (renamed from astroid/brain/_mechanize.py)0
-rw-r--r--astroid/brain/brain_nose.py (renamed from astroid/brain/_nose.py)0
-rw-r--r--astroid/brain/brain_numpy.py (renamed from astroid/brain/_numpy.py)0
-rw-r--r--astroid/brain/brain_pytest.py (renamed from astroid/brain/_pytest.py)2
-rw-r--r--astroid/brain/brain_qt.py (renamed from astroid/brain/_qt.py)0
-rw-r--r--astroid/brain/brain_six.py (renamed from astroid/brain/_six.py)0
-rw-r--r--astroid/brain/brain_stdlib.py (renamed from astroid/brain/_stdlib.py)0
-rw-r--r--astroid/tests/unittest_brain.py22
11 files changed, 23 insertions, 1 deletions
diff --git a/astroid/brain/_builtin_inference.py b/astroid/brain/brain_builtin_inference.py
index c6245be..c6245be 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 0b45412..0b45412 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 f8acb42..f8acb42 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 20a253a..20a253a 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 9a37f4e..9a37f4e 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 75f4f18..75f4f18 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 8165a2e..4f615c1 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 f568b65..f568b65 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 a1043ea..a1043ea 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 51265d6..51265d6 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 861fab2..cb35462 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()