Remove uneeded Python version compatibility checks. (#64076)
This commit is contained in:
parent
da8ec327cc
commit
6a763d7133
3 changed files with 4 additions and 11 deletions
2
changelogs/fragments/64076-urls-timeout-parameter.yml
Normal file
2
changelogs/fragments/64076-urls-timeout-parameter.yml
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- core - remove unneeded Python version checks.
|
|
@ -1285,14 +1285,7 @@ class Request:
|
||||||
else:
|
else:
|
||||||
request.add_header(header, headers[header])
|
request.add_header(header, headers[header])
|
||||||
|
|
||||||
urlopen_args = [request, None]
|
return urllib_request.urlopen(request, None, timeout)
|
||||||
if sys.version_info >= (2, 6, 0):
|
|
||||||
# urlopen in python prior to 2.6.0 did not
|
|
||||||
# have a timeout parameter
|
|
||||||
urlopen_args.append(timeout)
|
|
||||||
|
|
||||||
r = urllib_request.urlopen(*urlopen_args)
|
|
||||||
return r
|
|
||||||
|
|
||||||
def get(self, url, **kwargs):
|
def get(self, url, **kwargs):
|
||||||
r"""Sends a GET request. Returns :class:`HTTPResponse` object.
|
r"""Sends a GET request. Returns :class:`HTTPResponse` object.
|
||||||
|
|
|
@ -216,7 +216,6 @@ import os
|
||||||
import pwd
|
import pwd
|
||||||
import re
|
import re
|
||||||
import stat
|
import stat
|
||||||
import sys
|
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
|
@ -409,8 +408,7 @@ def main():
|
||||||
for npath in params['paths']:
|
for npath in params['paths']:
|
||||||
npath = os.path.expanduser(os.path.expandvars(npath))
|
npath = os.path.expanduser(os.path.expandvars(npath))
|
||||||
if os.path.isdir(npath):
|
if os.path.isdir(npath):
|
||||||
''' ignore followlinks for python version < 2.6 '''
|
for root, dirs, files in os.walk(npath, followlinks=params['follow']):
|
||||||
for root, dirs, files in (sys.version_info < (2, 6, 0) and os.walk(npath)) or os.walk(npath, followlinks=params['follow']):
|
|
||||||
if params['depth']:
|
if params['depth']:
|
||||||
depth = root.replace(npath.rstrip(os.path.sep), '').count(os.path.sep)
|
depth = root.replace(npath.rstrip(os.path.sep), '').count(os.path.sep)
|
||||||
if files or dirs:
|
if files or dirs:
|
||||||
|
|
Loading…
Reference in a new issue