From 9581c363b116f325ac5bad2b8bb4f9cd90d78e73 Mon Sep 17 00:00:00 2001 From: Adam Woodbeck Date: Sat, 29 Nov 2014 12:02:48 -0500 Subject: [PATCH] Fixed attribute reference and docstring. --- letsencrypt/client/client.py | 4 ++-- letsencrypt/client/le_util.py | 12 +++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py index f4b42f9a8..437d3d815 100644 --- a/letsencrypt/client/client.py +++ b/letsencrypt/client/client.py @@ -659,7 +659,7 @@ class Client(object): # Save file le_util.make_or_verify_dir(CONFIG.KEY_DIR, 0o700) - key_f, self.key_file = le_util.unique_file( + key_f, key_filename = le_util.unique_file( os.path.join(CONFIG.KEY_DIR, "key-letsencrypt.pem"), 0o600) key_f.write(key_pem) key_f.close() @@ -673,7 +673,7 @@ class Client(object): # Save CSR le_util.make_or_verify_dir(CONFIG.CERT_DIR, 0o755) - csr_f, self.csr_file = le_util.unique_file( + csr_f, csr_filename = le_util.unique_file( os.path.join(CONFIG.CERT_DIR, "csr-letsencrypt.pem"), 0o644) csr_f.write(csr_pem) csr_f.close() diff --git a/letsencrypt/client/le_util.py b/letsencrypt/client/le_util.py index 5e8f5414b..70b9f5a86 100644 --- a/letsencrypt/client/le_util.py +++ b/letsencrypt/client/le_util.py @@ -51,7 +51,17 @@ def check_permissions(filepath, mode, uid=0): def unique_file(default_name, mode=0o777): - """Safely finds a unique file for writing only (by default).""" + """Safely finds a unique file for writing only (by default). + + :param default_name: Default file name + :type default_name: str + + :param mode: File mode + :type mode: int + + :return: tuple of file object and file name + + """ count = 1 f_parsed = os.path.splitext(default_name) while 1: