Skip to content

Commit 4747180

Browse files
committed
removed redudant code and confirmed extra code would work from an env variable
1 parent 7c84046 commit 4747180

1 file changed

Lines changed: 7 additions & 12 deletions

File tree

CloudFlare/read_configs.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,27 @@ def read_configs():
2626
email = re.sub(r"\s+", '', config.get('CloudFlare', 'email'))
2727
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
2828
email = None
29-
except ConfigParser.NoSectionError:
30-
email = None
3129

3230
if token is None:
3331
try:
3432
token = re.sub(r"\s+", '', config.get('CloudFlare', 'token'))
3533
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
3634
token = None
37-
except ConfigParser.NoSectionError:
38-
token = None
3935

4036
if certtoken is None:
4137
try:
4238
certtoken = re.sub(r"\s+", '', config.get('CloudFlare', 'certtoken'))
4339
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
4440
certtoken = None
45-
except ConfigParser.NoSectionError:
46-
certtoken = None
4741

48-
try:
49-
extras = re.sub(r"\s+", ' ', config.get('CloudFlare', 'extras'))
50-
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
51-
extras = None
42+
if extras is None:
43+
try:
44+
extras = re.sub(r"\s+", ' ', config.get('CloudFlare', 'extras'))
45+
except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
46+
extras = None
5247

53-
if extras:
54-
extras = extras.split(' ')
48+
if extras:
49+
extras = extras.split(' ')
5550

5651
return [email, token, certtoken, extras]
5752

0 commit comments

Comments
 (0)