Skip to contentSkip to conversation

Fix E275 missing whitespace after keyword

PATCH In review Petr Lautrbach 2 participants 3 messages Nov 21, 2022 – Nov 23, 2022 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix E275 missing whitespace after keyword

Fixes:
./gui/polgengui.py:484:18: E275 missing whitespace after keyword ./gui/polgengui.py:530:18: E275 missing whitespace after keyword ./python/sepolgen/src/sepolgen/policygen.py:327:19: E275 missing whitespace after keyword ./python/sepolgen/src/sepolgen/policygen.py:329:11: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/__init__.py:453:15: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/generate.py:1351:28: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/generate.py:1353:28: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:638:24: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:863:23: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:2177:16: E275 missing whitespace after keyword ./sandbox/sandbox:114:7: E275 missing whitespace after keyword ./sandbox/sandbox:134:11: E275 missing whitespace after keyword ./sandbox/sandbox:136:7: E275 missing whitespace after keyword

---
 gui/polgengui.py                          | 4 ++--
 python/sepolgen/src/sepolgen/policygen.py | 4 ++--
 python/sepolicy/sepolicy/__init__.py      | 4 ++--
 python/sepolicy/sepolicy/generate.py      | 4 ++--
 python/sepolicy/sepolicy/gui.py           | 6 +++---
 sandbox/sandbox                           | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)
gui/polgengui.py +2 -2
index 7a3ecd50c91c..16116ba68b61 100644
@@ -481,7 +481,7 @@ class childWindow:
             my_policy = sepolicy.generate.policy(self.get_name(), self.get_type())
 
             iter = self.boolean_store.get_iter_first()
-            while(iter):
+            while iter:
                 my_policy.add_boolean(self.boolean_store.get_value(iter, 0), self.boolean_store.get_value(iter, 1))
                 iter = self.boolean_store.iter_next(iter)
 
@@ -527,7 +527,7 @@ class childWindow:
             my_policy.set_out_udp(self.out_udp_all_checkbutton.get_active(), self.out_udp_entry.get_text())
 
             iter = self.store.get_iter_first()
-            while(iter):
+            while iter:
                 if self.store.get_value(iter, 1) == FILE:
                     my_policy.add_file(self.store.get_value(iter, 0))
                 else:
python/sepolgen/src/sepolgen/policygen.py +2 -2
index 8f0ce26e4dc7..183b41a93d50 100644
@@ -324,9 +324,9 @@ def call_interface(interface, av):
             ifcall.args.append(av.obj_class)
         else:
             print(params[i].type)
-            assert(0)
+            assert 0
 
-    assert(len(ifcall.args) > 0)
+    assert len(ifcall.args) > 0
 
     return ifcall
 
python/sepolicy/sepolicy/__init__.py +2 -2
index 9c3caa05b80b..05888e5cb94a 100644
@@ -450,9 +450,9 @@ def get_conditionals(src, dest, tclass, perm):
                 tlist.append(tdict)
                 tdict = {}
     except KeyError:
-        return(tlist)
+        return tlist
 
-    return (tlist)
+    return tlist
 
 
 def get_conditionals_format_text(cond):
python/sepolicy/sepolicy/generate.py +2 -2
index 3717d5d4ed78..b6df3e91160b 100644
@@ -1346,9 +1346,9 @@ allow %s_t %s_t:%s_socket name_%s;
             if len(temp_dirs) != 0:
                 for i in temp_dirs:
                     if i in self.dirs.keys():
-                        del(self.dirs[i])
+                        del self.dirs[i]
                     elif i in self.files.keys():
-                        del(self.files[i])
+                        del self.files[i]
                     else:
                         continue
 
python/sepolicy/sepolicy/gui.py +3 -3
index 335be582b668..c8f33f522a2d 100644
@@ -635,7 +635,7 @@ class SELinuxGui():
         for k in self.cur_dict:
             for j in self.cur_dict[k]:
                 if i == ctr:
-                    del(self.cur_dict[k][j])
+                    del self.cur_dict[k][j]
                     return
                 i += 1
 
@@ -860,7 +860,7 @@ class SELinuxGui():
                     if val is True or val is False or val is None:
                         continue
                     # Returns true if filter_txt exists within the val
-                    if(val.find(self.filter_txt) != -1 or val.lower().find(self.filter_txt) != -1):
+                    if val.find(self.filter_txt) != -1 or val.lower().find(self.filter_txt) != -1:
                         return True
                 except (AttributeError, TypeError):
                     pass
@@ -2174,7 +2174,7 @@ class SELinuxGui():
         model.set_value(iter, 0, not model.get_value(iter, 0))
         active = model.get_value(iter, 0)
         if name in self.cur_dict["boolean"]:
-            del(self.cur_dict["boolean"][name])
+            del self.cur_dict["boolean"][name]
         else:
             self.cur_dict["boolean"][name] = {"active": active}
         self.new_updates()
sandbox/sandbox +3 -3
index 770807345858..a2762a7d215a 100644
@@ -111,7 +111,7 @@ def copyfile(file, srcdir, dest):
 
 def savefile(new, orig, X_ind):
     copy = False
-    if(X_ind):
+    if X_ind:
         import gi
         gi.require_version('Gtk', '3.0')
         from gi.repository import Gtk
@@ -131,9 +131,9 @@ def savefile(new, orig, X_ind):
         except NameError:
             pass
         ans = input(_("Do you want to save changes to '%s' (y/N): ") % orig)
-        if(re.match(_("[yY]"), ans)):
+        if re.match(_("[yY]"), ans):
             copy = True
-    if(copy):
+    if copy:
         shutil.copy2(new, orig)
 
 
Signature · 1 line
2.38.1
Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines · Petr Lautrbach

Fixes:
./gui/polgengui.py:484:18: E275 missing whitespace after keyword ./gui/polgengui.py:530:18: E275 missing whitespace after keyword ./python/sepolgen/src/sepolgen/policygen.py:327:19: E275 missing whitespace after keyword ./python/sepolgen/src/sepolgen/policygen.py:329:11: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/__init__.py:453:15: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/generate.py:1351:28: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/generate.py:1353:28: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:638:24: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:863:23: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:2177:16: E275 missing whitespace after keyword ./sandbox/sandbox:114:7: E275 missing whitespace after keyword ./sandbox/sandbox:134:11: E275 missing whitespace after keyword ./sandbox/sandbox:136:7: E275 missing whitespace after keyword

Quoted 1 line
Quoted 138 lines
---
 gui/polgengui.py                          | 4 ++--
 python/sepolgen/src/sepolgen/policygen.py | 4 ++--
 python/sepolicy/sepolicy/__init__.py      | 4 ++--
 python/sepolicy/sepolicy/generate.py      | 4 ++--
 python/sepolicy/sepolicy/gui.py           | 6 +++---
 sandbox/sandbox                           | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)
gui/polgengui.py +2 -2
index 7a3ecd50c91c..16116ba68b61 100644
@@ -481,7 +481,7 @@ class childWindow:
             my_policy = sepolicy.generate.policy(self.get_name(), self.get_type())
 
             iter = self.boolean_store.get_iter_first()
-            while(iter):
+            while iter:
                 my_policy.add_boolean(self.boolean_store.get_value(iter, 0), self.boolean_store.get_value(iter, 1))
                 iter = self.boolean_store.iter_next(iter)
 
@@ -527,7 +527,7 @@ class childWindow:
             my_policy.set_out_udp(self.out_udp_all_checkbutton.get_active(), self.out_udp_entry.get_text())
 
             iter = self.store.get_iter_first()
-            while(iter):
+            while iter:
                 if self.store.get_value(iter, 1) == FILE:
                     my_policy.add_file(self.store.get_value(iter, 0))
                 else:
python/sepolgen/src/sepolgen/policygen.py +2 -2
index 8f0ce26e4dc7..183b41a93d50 100644
@@ -324,9 +324,9 @@ def call_interface(interface, av):
             ifcall.args.append(av.obj_class)
         else:
             print(params[i].type)
-            assert(0)
+            assert 0
 
-    assert(len(ifcall.args) > 0)
+    assert len(ifcall.args) > 0
 
     return ifcall
 
python/sepolicy/sepolicy/__init__.py +2 -2
index 9c3caa05b80b..05888e5cb94a 100644
@@ -450,9 +450,9 @@ def get_conditionals(src, dest, tclass, perm):
                 tlist.append(tdict)
                 tdict = {}
     except KeyError:
-        return(tlist)
+        return tlist
 
-    return (tlist)
+    return tlist
 
 
 def get_conditionals_format_text(cond):
python/sepolicy/sepolicy/generate.py +2 -2
index 3717d5d4ed78..b6df3e91160b 100644
@@ -1346,9 +1346,9 @@ allow %s_t %s_t:%s_socket name_%s;
             if len(temp_dirs) != 0:
                 for i in temp_dirs:
                     if i in self.dirs.keys():
-                        del(self.dirs[i])
+                        del self.dirs[i]
                     elif i in self.files.keys():
-                        del(self.files[i])
+                        del self.files[i]
                     else:
                         continue
 
python/sepolicy/sepolicy/gui.py +3 -3
index 335be582b668..c8f33f522a2d 100644
@@ -635,7 +635,7 @@ class SELinuxGui():
         for k in self.cur_dict:
             for j in self.cur_dict[k]:
                 if i == ctr:
-                    del(self.cur_dict[k][j])
+                    del self.cur_dict[k][j]
                     return
                 i += 1
 
@@ -860,7 +860,7 @@ class SELinuxGui():
                     if val is True or val is False or val is None:
                         continue
                     # Returns true if filter_txt exists within the val
-                    if(val.find(self.filter_txt) != -1 or val.lower().find(self.filter_txt) != -1):
+                    if val.find(self.filter_txt) != -1 or val.lower().find(self.filter_txt) != -1:
                         return True
                 except (AttributeError, TypeError):
                     pass
@@ -2174,7 +2174,7 @@ class SELinuxGui():
         model.set_value(iter, 0, not model.get_value(iter, 0))
         active = model.get_value(iter, 0)
         if name in self.cur_dict["boolean"]:
-            del(self.cur_dict["boolean"][name])
+            del self.cur_dict["boolean"][name]
         else:
             self.cur_dict["boolean"][name] = {"active": active}
         self.new_updates()
sandbox/sandbox +3 -4
index 770807345858..a2762a7d215a 100644
@@ -111,7 +111,7 @@ def copyfile(file, srcdir, dest):
 
 def savefile(new, orig, X_ind):
     copy = False
-    if(X_ind):
+    if X_ind:
         import gi
         gi.require_version('Gtk', '3.0')
         from gi.repository import Gtk
@@ -131,9 +131,9 @@ def savefile(new, orig, X_ind):
         except NameError:
             pass
         ans = input(_("Do you want to save changes to '%s' (y/N): ") % orig)
-        if(re.match(_("[yY]"), ans)):
+        if re.match(_("[yY]"), ans):
             copy = True
-    if(copy):
+    if copy:
         shutil.copy2(new, orig)
 
 
--

2.38.1

#2 lore raw
Quoted 18 lines · James Carter
Quoted 16 lines · Petr Lautrbach

Fixes:
./gui/polgengui.py:484:18: E275 missing whitespace after keyword ./gui/polgengui.py:530:18: E275 missing whitespace after keyword ./python/sepolgen/src/sepolgen/policygen.py:327:19: E275 missing whitespace after keyword ./python/sepolgen/src/sepolgen/policygen.py:329:11: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/__init__.py:453:15: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/generate.py:1351:28: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/generate.py:1353:28: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:638:24: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:863:23: E275 missing whitespace after keyword ./python/sepolicy/sepolicy/gui.py:2177:16: E275 missing whitespace after keyword ./sandbox/sandbox:114:7: E275 missing whitespace after keyword ./sandbox/sandbox:134:11: E275 missing whitespace after keyword ./sandbox/sandbox:136:7: E275 missing whitespace after keyword

Quoted 4 lines
Quoted 1 line

Merged.
Thanks,
Jim

Quoted 138 lines
Quoted 138 lines
---
 gui/polgengui.py                          | 4 ++--
 python/sepolgen/src/sepolgen/policygen.py | 4 ++--
 python/sepolicy/sepolicy/__init__.py      | 4 ++--
 python/sepolicy/sepolicy/generate.py      | 4 ++--
 python/sepolicy/sepolicy/gui.py           | 6 +++---
 sandbox/sandbox                           | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)
gui/polgengui.py +2 -2
index 7a3ecd50c91c..16116ba68b61 100644
@@ -481,7 +481,7 @@ class childWindow:
             my_policy = sepolicy.generate.policy(self.get_name(), self.get_type())
 
             iter = self.boolean_store.get_iter_first()
-            while(iter):
+            while iter:
                 my_policy.add_boolean(self.boolean_store.get_value(iter, 0), self.boolean_store.get_value(iter, 1))
                 iter = self.boolean_store.iter_next(iter)
 
@@ -527,7 +527,7 @@ class childWindow:
             my_policy.set_out_udp(self.out_udp_all_checkbutton.get_active(), self.out_udp_entry.get_text())
 
             iter = self.store.get_iter_first()
-            while(iter):
+            while iter:
                 if self.store.get_value(iter, 1) == FILE:
                     my_policy.add_file(self.store.get_value(iter, 0))
                 else:
python/sepolgen/src/sepolgen/policygen.py +2 -2
index 8f0ce26e4dc7..183b41a93d50 100644
@@ -324,9 +324,9 @@ def call_interface(interface, av):
             ifcall.args.append(av.obj_class)
         else:
             print(params[i].type)
-            assert(0)
+            assert 0
 
-    assert(len(ifcall.args) > 0)
+    assert len(ifcall.args) > 0
 
     return ifcall
 
python/sepolicy/sepolicy/__init__.py +2 -2
index 9c3caa05b80b..05888e5cb94a 100644
@@ -450,9 +450,9 @@ def get_conditionals(src, dest, tclass, perm):
                 tlist.append(tdict)
                 tdict = {}
     except KeyError:
-        return(tlist)
+        return tlist
 
-    return (tlist)
+    return tlist
 
 
 def get_conditionals_format_text(cond):
python/sepolicy/sepolicy/generate.py +2 -2
index 3717d5d4ed78..b6df3e91160b 100644
@@ -1346,9 +1346,9 @@ allow %s_t %s_t:%s_socket name_%s;
             if len(temp_dirs) != 0:
                 for i in temp_dirs:
                     if i in self.dirs.keys():
-                        del(self.dirs[i])
+                        del self.dirs[i]
                     elif i in self.files.keys():
-                        del(self.files[i])
+                        del self.files[i]
                     else:
                         continue
 
python/sepolicy/sepolicy/gui.py +3 -3
index 335be582b668..c8f33f522a2d 100644
@@ -635,7 +635,7 @@ class SELinuxGui():
         for k in self.cur_dict:
             for j in self.cur_dict[k]:
                 if i == ctr:
-                    del(self.cur_dict[k][j])
+                    del self.cur_dict[k][j]
                     return
                 i += 1
 
@@ -860,7 +860,7 @@ class SELinuxGui():
                     if val is True or val is False or val is None:
                         continue
                     # Returns true if filter_txt exists within the val
-                    if(val.find(self.filter_txt) != -1 or val.lower().find(self.filter_txt) != -1):
+                    if val.find(self.filter_txt) != -1 or val.lower().find(self.filter_txt) != -1:
                         return True
                 except (AttributeError, TypeError):
                     pass
@@ -2174,7 +2174,7 @@ class SELinuxGui():
         model.set_value(iter, 0, not model.get_value(iter, 0))
         active = model.get_value(iter, 0)
         if name in self.cur_dict["boolean"]:
-            del(self.cur_dict["boolean"][name])
+            del self.cur_dict["boolean"][name]
         else:
             self.cur_dict["boolean"][name] = {"active": active}
         self.new_updates()
sandbox/sandbox +3 -4
index 770807345858..a2762a7d215a 100644
@@ -111,7 +111,7 @@ def copyfile(file, srcdir, dest):
 
 def savefile(new, orig, X_ind):
     copy = False
-    if(X_ind):
+    if X_ind:
         import gi
         gi.require_version('Gtk', '3.0')
         from gi.repository import Gtk
@@ -131,9 +131,9 @@ def savefile(new, orig, X_ind):
         except NameError:
             pass
         ans = input(_("Do you want to save changes to '%s' (y/N): ") % orig)
-        if(re.match(_("[yY]"), ans)):
+        if re.match(_("[yY]"), ans):
             copy = True
-    if(copy):
+    if copy:
         shutil.copy2(new, orig)
 
 
--

2.38.1