be explicit about urllib import and remove conditional urllib(2) import

urllib and urllib2 have been in the python stdlib since at least
python-2.3.  There's no reason to conditionalize it.

Fixes https://github.com/ansible/ansible/issues/11322
This commit is contained in:
Toshio Kuratomi
2015-06-19 08:59:19 -07:00
committed by Matt Clay
parent 655fa27dc7
commit 16bd2c7357
11 changed files with 23 additions and 20 deletions

View File

@@ -104,10 +104,7 @@ EXAMPLES = '''
# =======================================
# twilio module support methods
#
try:
import urllib, urllib2
except ImportError:
module.fail_json(msg="urllib and urllib2 are required")
import urllib, urllib2
import base64