removed duplicate code because of multipul PRs

markllama · Jul 4, 2016 · 1641115 · 1641115
2 parents 0e6a6fe + 6272de8
commit 1641115
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/CloudFlare/read_configs.py b/CloudFlare/read_configs.py
@@ -24,32 +24,30 @@ def read_configs():
     if email is None:
         try:
             email = re.sub(r"\s+", '', config.get('CloudFlare', 'email'))
-        except ConfigParser.NoOptionError:
+        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:
+        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:
+        except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             certtoken = None
         except ConfigParser.NoSectionError:
             certtoken = None
 
     try:
         extras = re.sub(r"\s+", ' ', config.get('CloudFlare', 'extras'))
-    except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
-        extras = None
-    except ConfigParser.NoSectionError:
+    except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
         extras = None
 
     if extras: