Merge pull request #96 from Venafi/coverage

HTTP package refactoring

Author: rvelaVenafi

vcert/common.py

@@ -31,7 +31,7 @@
 from six import string_types, binary_type
 
 from .errors import VenafiConnectionError, ServerUnexptedBehavior, BadData, ClientBadData
-from .http import HTTPStatus
+from .http_status import HTTPStatus
 from .policy import PolicySpecification
 from .ssh_utils import SSHCertRequest, SSHRetrieveResponse, SSHCATemplateRequest, SSHConfig
 from .tpp_utils import IssuerHint

vcert/connection_cloud.py

@@ -16,7 +16,6 @@
 import base64
 import re
 import time
-from pprint import pprint
 
 import requests
 import six.moves.urllib.parse as urlparse
@@ -28,7 +27,7 @@
                      CSR_ORIGIN_SERVICE, CHAIN_OPTION_FIRST, CHAIN_OPTION_LAST)
 from .errors import (VenafiConnectionError, ServerUnexptedBehavior, ClientBadData, CertificateRequestError,
                      CertificateRenewError, VenafiError, RetrieveCertificateTimeoutError)
-from .http import HTTPStatus
+from .http_status import HTTPStatus
 from .logger import get_child
 from .pem import parse_pem, Certificate
 from .policy import PolicySpecification

vcert/connection_tpp.py

@@ -22,7 +22,7 @@
 from .common import MIME_JSON
 from .connection_tpp_abstract import AbstractTPPConnection, URLS
 from .errors import (ServerUnexptedBehavior, ClientBadData, AuthenticationError)
-from .http import HTTPStatus
+from .http_status import HTTPStatus
 
 TOKEN_HEADER_NAME = "x-venafi-api-key"  # nosec
 

vcert/connection_tpp_abstract.py

@@ -18,7 +18,6 @@
 import re
 import time
 from datetime import datetime, timedelta
-from pprint import pprint
 
 from cryptography import x509
 from cryptography.hazmat.backends import default_backend
@@ -29,7 +28,7 @@
     CSR_ORIGIN_SERVICE, KeyType, CHAIN_OPTION_LAST, CHAIN_OPTION_FIRST, CHAIN_OPTION_IGNORE, Policy, ZoneConfig
 from .errors import VenafiError, ServerUnexptedBehavior, ClientBadData, RetrieveCertificateTimeoutError, \
     CertificateRequestError, CertificateRenewError
-from .http import HTTPStatus
+from .http_status import HTTPStatus
 from .pem import parse_pem
 from .policy import RPA, SPA
 from .policy.pm_tpp import TPPPolicy, is_service_generated_csr, SetAttrResponse, validate_policy_spec, \

vcert/connection_tpp_token.py

@@ -22,7 +22,7 @@
 from .common import MIME_JSON, TokenInfo, Authentication
 from .connection_tpp_abstract import AbstractTPPConnection, URLS
 from .errors import (ClientBadData, ServerUnexptedBehavior, AuthenticationError)
-from .http import HTTPStatus
+from .http_status import HTTPStatus
 
 HEADER_AUTHORIZATION = 'Authorization'