Fixes for case insensitive systems, fix for Cloudflare

dvershinin · Apr 28, 2022 · 7f3b096 · 7f3b096
1 parent 7b3b78d
commit 7f3b096
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/cds/CloudflareWrapper.py b/cds/CloudflareWrapper.py
@@ -122,9 +122,7 @@ def block_ip(self, ip, comment='fds'):
             log.info('Skipped block in Cloudflare as it was not set up. Run fds config?')
             return
         nets = network_for_cloudflare(ip)
-        nets_len = len(nets)
-        if nets_len > 1:
-            log.info('Converted supplied network into {} entries for Cloudflare'.format(nets_len))
+        # do not try to len(nets) as they may be not countable iterator!
         for a in self.all_accounts:
             for n in nets:
                 log.info('Blocking {} in Cloudflare account {}'.format(ip, a['name']))

diff --git a/fds/config.py → fds/config_funcs.py b/fds/config.py → fds/config_funcs.py
diff --git a/fds/fds.py b/fds/fds.py
@@ -10,7 +10,7 @@
 from .Countries import Countries
 from .FirewallWrapper import FirewallWrapper
 from .__about__ import __version__
-from .config import action_config
+from .config_funcs import action_config
 
 
 def commandline_arg(bytestring):