[req-changes] Removed pprint and refactor code

openwisp · Mar 18, 2024 · e0049b6 · e0049b6
1 parent d6f19ac
commit e0049b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/netjsonconfig/backends/openwrt/converters/wireless.py b/netjsonconfig/backends/openwrt/converters/wireless.py
@@ -144,9 +144,9 @@ def __intermediate_encryption_wpa_enterprise(self, wireless, encryption, uci):
                 if option in encryption:
                     uci[f'auth_{option}'] = encryption[option]
             uci['auth_secret'] = encryption['key']
-            if not encryption.get('acct_secret'):
+            if 'acct_secret' not in encryption:
                 uci['acct_secret'] = encryption['key']
-            if encryption.get('acct_server_port'):
+            if 'acct_server_port' in encryption:
                 uci['acct_port'] = encryption.pop('acct_server_port')
 
     roaming_properties = (
@@ -338,14 +338,14 @@ def __netjson_encryption(self, wifi):  # noqa: C901
         if 'enterprise' in settings['protocol']:
             if 'auth_secret' in settings:
                 settings['key'] = settings.pop('auth_secret')
-            if settings.get('acct_secret') and settings['acct_secret'] == settings.get(
+            if 'acct_secret' in settings and settings['acct_secret'] == settings.get(
                 'key'
             ):
                 settings.pop('acct_secret')
             for option in ['server', 'port']:
                 if f'auth_{option}' in settings:
                     settings[option] = settings.pop(f'auth_{option}')
-            if settings.get('acct_port'):
+            if 'acct_port' in settings:
                 settings['acct_server_port'] = settings.pop('acct_port')
         # Management Frame Protection
         if 'ieee80211w' in wifi:

diff --git a/tests/openwrt/test_encryption.py b/tests/openwrt/test_encryption.py
@@ -383,9 +383,6 @@ def test_render_wpa3_enterprise(self):
 
     def test_parse_wpa3_enterprise(self):
         o = OpenWrt(native=self._wpa3_enterprise_ap_uci)
-        from pprint import pprint
-
-        pprint(dict(o.config))
         self.assertEqual(o.config, self._wpa3_enterprise_ap_netjson)
 
     _wpa2_enterprise_ap_netjson = {