use exist_ok

piqueserver · Mar 22, 2018 · 57272a8 · 57272a8
1 parent 52663d7
commit 57272a8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/piqueserver/run.py b/piqueserver/run.py
@@ -40,8 +40,7 @@ def copytree(src, dst):
     Doesn't over-write if src/dst files don't differ.
     Creates a backup of dst file before over-writing.
     """
-    if not os.path.exists(dst):
-        os.makedirs(dst)
+    os.makedirs(dst, exist_ok=True)
     for item in os.listdir(src):
         s = os.path.join(src, item)
         d = os.path.join(dst, item)
@@ -84,8 +83,7 @@ def update_geoip(target_dir):
         print('Configuration directory does not exist')
         return 1
 
-    if not os.path.exists(working_directory):
-        os.makedirs(working_directory)
+    os.makedirs(working_directory, exist_ok=True)
 
     print('Downloading %s' % MAXMIND_DOWNLOAD)
 

diff --git a/piqueserver/server.py b/piqueserver/server.py
@@ -166,10 +166,7 @@ def check_scripts(scripts):
 
 def ensure_dir_exists(filename: str) -> None:
     d = os.path.dirname(filename)
-    try:
-        os.makedirs(d)
-    except FileExistsError:
-        pass
+    os.makedirs(d, exist_ok=True)
 
 
 def random_choice_cycle(choices):