summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-03-12 21:42:34 -0700
committerChris McDonough <chrism@plope.com>2012-03-12 21:42:34 -0700
commit7fcc3068d4317e81c791adc51d1144e79b654a67 (patch)
tree6c9250131053c318fae80fae6e4a658527f60d1a
parent942da22abb1df279ef389b8d1234b11237256b12 (diff)
downloadpyramid-7fcc3068d4317e81c791adc51d1144e79b654a67.tar.gz
pyramid-7fcc3068d4317e81c791adc51d1144e79b654a67.tar.bz2
pyramid-7fcc3068d4317e81c791adc51d1144e79b654a67.zip
py3 compat
-rw-r--r--pyramid/tests/test_scripts/test_pserve.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pyramid/tests/test_scripts/test_pserve.py b/pyramid/tests/test_scripts/test_pserve.py
index 6417791f3..1b45a5d90 100644
--- a/pyramid/tests/test_scripts/test_pserve.py
+++ b/pyramid/tests/test_scripts/test_pserve.py
@@ -1,9 +1,14 @@
import atexit
-import __builtin__
import os
import tempfile
import unittest
+from pyramid.compat import PY3
+if PY3: # pragma: no cover
+ import builtins as __builtin__
+else:
+ import __builtin__
+
class TestPServeCommand(unittest.TestCase):
def setUp(self):
from pyramid.compat import NativeIO