Removed trailing whitespace as well as unused imports

letsencrypt/client/client.py

@@ -2,7 +2,7 @@
 
 import M2Crypto
 import json
-import os, grp, pwd, sys, time, random, sys, shutil
+import os, time, sys, shutil
 
 # This line suppresses the no logging found for module 'jose' warning
 # TODO: Check out this module and see if we should be using it for our
@@ -12,22 +12,15 @@ logging.basicConfig(filename="/dev/null", level=logging.ERROR)
 
 
 import jose, csv
-import subprocess
-from M2Crypto import EVP, X509, RSA
-from Crypto.Random import get_random_bytes
-from Crypto.PublicKey import RSA
-from Crypto.Signature import PKCS1_v1_5
-from Crypto.Hash import SHA256
 
 import requests
 
 from letsencrypt.client.acme import acme_object_validate
 from letsencrypt.client.sni_challenge import SNI_Challenge
-from letsencrypt.client.payment_challenge import Payment_Challenge
 from letsencrypt.client import configurator
 from letsencrypt.client import logger, display
-from letsencrypt.client import le_util, crypto_util, display
+from letsencrypt.client import le_util, crypto_util
-from letsencrypt.client.CONFIG import NONCE_SIZE, RSA_KEY_SIZE, CERT_PATH
+from letsencrypt.client.CONFIG import RSA_KEY_SIZE, CERT_PATH
 from letsencrypt.client.CONFIG import CHAIN_PATH, SERVER_ROOT, KEY_DIR, CERT_DIR
 from letsencrypt.client.CONFIG import CERT_KEY_BACKUP
 from letsencrypt.client.CONFIG import CHALLENGE_PREFERENCES, EXCLUSIVE_CHALLENGES

letsencrypt/client/configurator.py

@@ -3,11 +3,9 @@ import subprocess
 import re
 import os
 import sys
-import stat
 import socket
 import time
 import shutil
-import errno
 
 from letsencrypt.client.CONFIG import SERVER_ROOT, BACKUP_DIR
 from letsencrypt.client.CONFIG import REWRITE_HTTPS_ARGS, CONFIG_DIR, WORK_DIR

letsencrypt/client/crypto_util.py

@@ -8,7 +8,6 @@ from Crypto.Hash import SHA256
 from M2Crypto import EVP, X509, ASN1
 
 
-from letsencrypt.client import logger
 from letsencrypt.client.CONFIG import NONCE_SIZE, RSA_KEY_SIZE
 
 

letsencrypt/client/interactive_challenge.py

@@ -1,5 +1,4 @@
 from letsencrypt.client.challenge import Challenge
-from letsencrypt.client import logger
 import textwrap
 
 ############################################################

letsencrypt/client/logger.py

@@ -1,4 +1,3 @@
-import sys
 import time
 from letsencrypt.client import display
 

letsencrypt/client/payment_challenge.py

@@ -1,5 +1,4 @@
 from letsencrypt.client.challenge import Challenge
-from letsencrypt.client import logger
 import dialog
 
 ############################################################

letsencrypt/client/recovery_token_challenge.py

@@ -1,6 +1,4 @@
 from letsencrypt.client.challenge import Challenge
-from letsencrypt.client import logger
-from letsencrypt.client.CONFIG import RECOVERY_TOKEN_EXT
 
 class RecoveryToken(Challenge):
 

letsencrypt/client/sni_challenge.py

@@ -1,22 +1,18 @@
 #!/usr/bin/env python
 
-import subprocess
 import M2Crypto
 from Crypto import Random
-import hmac
 import hashlib
-from shutil import move
+from os import path
-from os import remove, close, path
 import sys
 import binascii
-import augeas
 import jose
 
 from letsencrypt.client import configurator
 
 from letsencrypt.client.CONFIG import CONFIG_DIR, WORK_DIR, SERVER_ROOT
 from letsencrypt.client.CONFIG import OPTIONS_SSL_CONF, APACHE_CHALLENGE_CONF, INVALID_EXT
-from letsencrypt.client.CONFIG import S_SIZE, NONCE_SIZE
+from letsencrypt.client.CONFIG import S_SIZE
 from letsencrypt.client import logger, crypto_util
 from letsencrypt.client.challenge import Challenge