From 1b494c7d56940f52ab80346b6052147ce59c45f0 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 24 Sep 2011 07:37:40 -0400
Subject: cope with moved module

---
 pyramid/scaffolds/tests.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3