From 08271105eeda4f9d5ffafadaca875c50ddf9b0d5 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 8 Feb 2021 12:09:27 -0800 Subject: [PATCH] stop using six.moves.xrange --- .../certbot_compatibility_test/validator.py | 3 +-- certbot-nginx/certbot_nginx/_internal/parser_obj.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/certbot-compatibility-test/certbot_compatibility_test/validator.py b/certbot-compatibility-test/certbot_compatibility_test/validator.py index bfa03f22d..1215b1a30 100644 --- a/certbot-compatibility-test/certbot_compatibility_test/validator.py +++ b/certbot-compatibility-test/certbot_compatibility_test/validator.py @@ -4,7 +4,6 @@ import socket import requests import six -from six.moves import xrange from acme import crypto_util from acme import errors as acme_errors @@ -62,7 +61,7 @@ class Validator(object): else: response = requests.get(url, allow_redirects=False) - return response.status_code in xrange(300, 309) + return response.status_code in range(300, 309) def hsts(self, name): """Test for HTTP Strict Transport Security header""" diff --git a/certbot-nginx/certbot_nginx/_internal/parser_obj.py b/certbot-nginx/certbot_nginx/_internal/parser_obj.py index 390e18e4d..7c11d1c13 100644 --- a/certbot-nginx/certbot_nginx/_internal/parser_obj.py +++ b/certbot-nginx/certbot_nginx/_internal/parser_obj.py @@ -184,7 +184,7 @@ class Statements(Parsable): def _space_list(list_): """ Inserts whitespace between adjacent non-whitespace tokens. """ spaced_statement = [] # type: List[str] - for i in reversed(six.moves.xrange(len(list_))): + for i in reversed(range(len(list_))): spaced_statement.insert(0, list_[i]) if i > 0 and not list_[i].isspace() and not list_[i-1].isspace(): spaced_statement.insert(0, " ")