Merge branch 'florianfesti:master' into kamishibai

florianfesti · Jan 14, 2025 · bfc75ee · bfc75ee
2 parents ecaa365 + 12270a1
commit bfc75ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/boxes/edges.py b/boxes/edges.py
@@ -1456,7 +1456,7 @@ def endwidth(self) -> float:
 
     def margin(self) -> float:
         if self.settings.outset and (
-                self.grip_percentage > 0.0 or
+                self.settings.grip_percentage > 0.0 or
                 self.settings.grip_length > 0.0 ):
             return self.settings.thickness + self.boxes.edges['g'].margin()
         else:

diff --git a/boxes/scripts/boxes_proxy.py b/boxes/scripts/boxes_proxy.py
@@ -12,13 +12,9 @@
 License: GNU GPL v3
 
 """
-pass
 import subprocess
 import sys
 
-pass
-from shlex import quote
-
 from lxml import etree
 
 import inkex