summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-24 07:37:40 -0400
committerChris McDonough <chrism@plope.com>2011-09-24 07:37:40 -0400
commit1b494c7d56940f52ab80346b6052147ce59c45f0 (patch)
tree705250cdf532b9d6f1d9c75f188a69002ea97ac2
parent45009ceddd0ecc7a41f8f2d8336e24f36e51f58d (diff)
downloadpyramid-1b494c7d56940f52ab80346b6052147ce59c45f0.tar.gz
pyramid-1b494c7d56940f52ab80346b6052147ce59c45f0.tar.bz2
pyramid-1b494c7d56940f52ab80346b6052147ce59c45f0.zip
cope with moved module
-rw-r--r--pyramid/scaffolds/tests.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pyramid/scaffolds/tests.py b/pyramid/scaffolds/tests.py
index fe5d6957a..7eb838e2f 100644
--- a/pyramid/scaffolds/tests.py
+++ b/pyramid/scaffolds/tests.py
@@ -1,5 +1,4 @@
import sys
-import httplib
import os
import pkg_resources
import shutil
@@ -8,6 +7,11 @@ import tempfile
import time
import signal
+try:
+ import httplib
+except ImportError: # pragma: no cover
+ import http.client as httplib
+
class TemplateTest(object):
def make_venv(self, directory): # pragma: no cover
import virtualenv