Fix a bad import for python 3.3+.

This also re-enables tox and travis.
This commit is contained in:
Craig Citro
2014-11-13 15:05:36 -08:00
parent 60b9df94b1
commit 92418e2938
3 changed files with 7 additions and 1 deletions

View File

@@ -5,6 +5,7 @@ env:
- TOX_ENV=py26openssl14
- TOX_ENV=py27openssl13
- TOX_ENV=py27openssl14
- TOX_ENV=py33openssl14
- TOX_ENV=py34openssl14
- TOX_ENV=pypyopenssl13
- TOX_ENV=pypyopenssl14

View File

@@ -24,12 +24,12 @@ from __future__ import print_function
__author__ = 'jcgregorio@google.com (Joe Gregorio)'
__all__ = ['argparser', 'run_flow', 'run', 'message_if_missing']
import BaseHTTPServer
import logging
import socket
import sys
import webbrowser
from six.moves import BaseHTTPServer
from six.moves import urllib
from oauth2client import client

View File

@@ -41,6 +41,11 @@ basepython = python2.7
deps = {[testenv]deps}
pyopenssl==0.14
[testenv:py33openssl14]
basepython = python3.3
deps = {[testenv]deps}
pyopenssl==0.14
[testenv:py34openssl14]
basepython = python3.4
deps = {[testenv]deps}