removed redudant code and confirmed extra code would work from an env…

… variable
stainless-api · Jul 4, 2016 · 4747180 · 4747180
1 parent 7c84046
commit 4747180
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/CloudFlare/read_configs.py b/CloudFlare/read_configs.py
@@ -26,32 +26,27 @@ def read_configs():
             email = re.sub(r"\s+", '', config.get('CloudFlare', 'email'))
         except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             email = None
-        except ConfigParser.NoSectionError:
-            email = None
 
     if token is None:
         try:
             token = re.sub(r"\s+", '', config.get('CloudFlare', 'token'))
         except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             token = None
-        except ConfigParser.NoSectionError:
-            token = None
 
     if certtoken is None:
         try:
             certtoken = re.sub(r"\s+", '', config.get('CloudFlare', 'certtoken'))
         except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             certtoken = None
-        except ConfigParser.NoSectionError:
-            certtoken = None
 
-    try:
-        extras = re.sub(r"\s+", ' ', config.get('CloudFlare', 'extras'))
-    except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
-        extras = None
+    if extras is None:
+        try:
+            extras = re.sub(r"\s+", ' ', config.get('CloudFlare', 'extras'))
+        except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
+            extras = None
 
-    if extras:
-        extras = extras.split(' ')
+        if extras:
+            extras = extras.split(' ')
 
     return [email, token, certtoken, extras]