Merge pull request #321 from snarfed/app_engine_httplib

app engine compatibility: handle missing httplib._CS_* constants

Author: jmadler

src/http/client.py

@@ -11,10 +11,6 @@
 from httplib import (HTTP_PORT,
                      HTTPS_PORT,
 
-                     _CS_IDLE,
-                     _CS_REQ_STARTED,
-                     _CS_REQ_SENT,
-
                      CONTINUE,
                      SWITCHING_PROTOCOLS,
                      PROCESSING,
@@ -81,6 +77,9 @@
 # These may not be available on all versions of Python 2.6.x or 2.7.x
 try:
     from httplib import (
+                         _CS_IDLE,
+                         _CS_REQ_STARTED,
+                         _CS_REQ_SENT,
                          _MAXLINE,
                          _MAXHEADERS,
                          _is_legal_header_name,