From 67acebff34af3adffd80b544582a891d6febb971 Mon Sep 17 00:00:00 2001
From: James Kasten <jdkasten@umich.edu>
Date: Wed, 16 Sep 2015 18:43:32 -0700
Subject: [PATCH] pep8 and google style guide

---
 .../letsencrypt_nginx/tests/configurator_test.py           | 1 +
 letsencrypt/crypto_util.py                                 | 7 +++----
 letsencrypt/tests/configuration_test.py                    | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/letsencrypt-nginx/letsencrypt_nginx/tests/configurator_test.py b/letsencrypt-nginx/letsencrypt_nginx/tests/configurator_test.py
index 93b04f56f..977a65330 100644
--- a/letsencrypt-nginx/letsencrypt_nginx/tests/configurator_test.py
+++ b/letsencrypt-nginx/letsencrypt_nginx/tests/configurator_test.py
@@ -14,6 +14,7 @@ from letsencrypt import errors
 
 from letsencrypt_nginx.tests import util
 
+
 class NginxConfiguratorTest(util.NginxTest):
     """Test a semi complex vhost configuration."""
 
diff --git a/letsencrypt/crypto_util.py b/letsencrypt/crypto_util.py
index a0fbb9bf7..79cd24ed6 100644
--- a/letsencrypt/crypto_util.py
+++ b/letsencrypt/crypto_util.py
@@ -9,13 +9,16 @@ import logging
 import os
 
 import OpenSSL
+import zope.component
 
 from acme import crypto_util as acme_crypto_util
 from acme import jose
 
 from letsencrypt import errors
+from letsencrypt import interfaces
 from letsencrypt import le_util
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -44,8 +47,6 @@ def init_save_key(key_size, key_dir, keyname="key-letsencrypt.pem"):
         logger.exception(err)
         raise err
 
-    import zope.component
-    from letsencrypt import interfaces
     config = zope.component.getUtility(interfaces.IConfig)
     # Save file
     le_util.make_or_verify_dir(key_dir, 0o700, os.geteuid(),
@@ -76,8 +77,6 @@ def init_save_csr(privkey, names, path, csrname="csr-letsencrypt.pem"):
     """
     csr_pem, csr_der = make_csr(privkey.pem, names)
 
-    import zope.component
-    from letsencrypt import interfaces
     config = zope.component.getUtility(interfaces.IConfig)
     # Save CSR
     le_util.make_or_verify_dir(path, 0o755, os.geteuid(),
diff --git a/letsencrypt/tests/configuration_test.py b/letsencrypt/tests/configuration_test.py
index bd5378b09..498147c6d 100644
--- a/letsencrypt/tests/configuration_test.py
+++ b/letsencrypt/tests/configuration_test.py
@@ -1,8 +1,10 @@
 """Tests for letsencrypt.configuration."""
 import os
 import unittest
+
 import mock
 
+
 class NamespaceConfigTest(unittest.TestCase):
     """Tests for letsencrypt.configuration.NamespaceConfig."""