summaryrefslogtreecommitdiff
path: root/pytest.py
diff options
context:
space:
mode:
authorSylvain Th?nault <sylvain.thenault@logilab.fr>2010-09-24 16:12:21 +0200
committerSylvain Th?nault <sylvain.thenault@logilab.fr>2010-09-24 16:12:21 +0200
commitc429f20605314f304551c6b40e0146415b7ae0b8 (patch)
treedc016208d4d325932a94d014220c4ed2525a1709 /pytest.py
parent1ca37b55f874d3df6f97a006c8690b985a86c00b (diff)
parent8e51e99c31e01f7db033f1bb19b8910059547089 (diff)
downloadlogilab-common-c429f20605314f304551c6b40e0146415b7ae0b8.tar.gz
backport stable into default
Diffstat (limited to 'pytest.py')
-rw-r--r--pytest.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/pytest.py b/pytest.py
index 3bfbb75..8add44b 100644
--- a/pytest.py
+++ b/pytest.py
@@ -123,8 +123,6 @@ import unittest
import imp
-import __builtin__
-
try:
import django