summaryrefslogtreecommitdiff
path: root/_pytest/main.py
diff options
context:
space:
mode:
authorBruno Oliveira <nicoddemus@gmail.com>2014-07-31 19:13:40 -0300
committerBruno Oliveira <nicoddemus@gmail.com>2014-07-31 19:13:40 -0300
commit5603a0cd4b6adf4fbf5e490216ebfcc0befbf10a (patch)
treeca3a3a80f9a9f211b3faa1cfbeb75d7aafbc6b93 /_pytest/main.py
parentbcdc3d0154b08cc70be96564e38c641375af764c (diff)
downloadpytest-5603a0cd4b6adf4fbf5e490216ebfcc0befbf10a.tar.gz
Removing py.std usage from _pytest
Diffstat (limited to '_pytest/main.py')
-rw-r--r--_pytest/main.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/_pytest/main.py b/_pytest/main.py
index 9ab13abd3..cbe2fabda 100644
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -1,4 +1,5 @@
""" core implementation of testing process: init, session, runtest loop. """
+import re
import py
import pytest, _pytest
@@ -19,7 +20,7 @@ EXIT_INTERRUPTED = 2
EXIT_INTERNALERROR = 3
EXIT_USAGEERROR = 4
-name_re = py.std.re.compile("^[a-zA-Z_]\w*$")
+name_re = re.compile("^[a-zA-Z_]\w*$")
def pytest_addoption(parser):
parser.addini("norecursedirs", "directory patterns to avoid for recursion",
@@ -315,7 +316,7 @@ class Node(object):
except py.builtin._sysex:
raise
except:
- failure = py.std.sys.exc_info()
+ failure = sys.exc_info()
setattr(self, exattrname, failure)
raise
setattr(self, attrname, res)