From ad38bb1eaf3d313e8df3d89db3cac090cc5c5afb Mon Sep 17 00:00:00 2001 From: Rotzbua Date: Sat, 31 Dec 2022 15:52:55 +0100 Subject: [PATCH] Auto optimize imports * Remove unused * Rearrange imports (module > partial > project) --- boxes/__init__.py | 24 +++++++++++++----------- boxes/drawing.py | 9 +++++---- boxes/edges.py | 9 +++++---- boxes/formats.py | 6 ++++-- boxes/gears.py | 3 ++- boxes/generators/__init__.py | 5 +++-- boxes/generators/agricolainsert.py | 1 + boxes/generators/angledbox.py | 3 +-- boxes/generators/atreus21.py | 5 +---- boxes/generators/bintray.py | 2 +- boxes/generators/can_storage.py | 2 +- boxes/generators/coffeecapsulesholder.py | 1 + boxes/generators/display.py | 2 +- boxes/generators/dividertray.py | 5 +++-- boxes/generators/doubleflexdoorbox.py | 3 ++- boxes/generators/drillstand.py | 3 ++- boxes/generators/filltest.py | 6 +++--- boxes/generators/flexbox.py | 3 ++- boxes/generators/flexbox2.py | 2 +- boxes/generators/flexbox3.py | 1 - boxes/generators/flexbox4.py | 1 - boxes/generators/flexbox5.py | 3 ++- boxes/generators/folder.py | 1 - boxes/generators/holepattern.py | 4 +--- boxes/generators/hooks.py | 2 +- boxes/generators/jigsaw.py | 1 - boxes/generators/keyboard.py | 6 ++++-- boxes/generators/lamp.py | 1 - boxes/generators/laptopstand.py | 3 ++- boxes/generators/microrack.py | 1 - boxes/generators/organpipe.py | 3 ++- boxes/generators/paperbox.py | 1 + boxes/generators/phoneholder.py | 1 + boxes/generators/planetary.py | 1 - boxes/generators/planetary2.py | 2 +- boxes/generators/platonic.py | 3 +-- boxes/generators/pulley.py | 1 - boxes/generators/rack10box.py | 1 - boxes/generators/rack19halfwidth.py | 2 +- boxes/generators/regularbox.py | 2 +- boxes/generators/regularstarbox.py | 2 +- boxes/generators/stachel.py | 2 +- boxes/generators/trafficlight.py | 2 +- boxes/generators/traylayout.py | 4 +--- boxes/generators/ubox.py | 2 +- boxes/generators/wallcaliperholder.py | 1 - boxes/generators/wallconsole.py | 1 - boxes/generators/walldrillbox.py | 3 ++- boxes/generators/walledges.py | 1 - boxes/generators/wallplaneholder.py | 1 - boxes/generators/wallstairs.py | 1 - boxes/parts.py | 2 ++ boxes/pulley.py | 1 + boxes/robot.py | 2 -- boxes/servos.py | 4 +++- boxes/svgutil.py | 3 +-- boxes/walledges.py | 6 ++++-- scripts/boxes2inkscape | 3 +-- scripts/boxes2pot | 4 ++-- scripts/boxesserver | 24 +++++++++++------------- 60 files changed, 102 insertions(+), 102 deletions(-) diff --git a/boxes/__init__.py b/boxes/__init__.py index f5b2e15..4122a3e 100755 --- a/boxes/__init__.py +++ b/boxes/__init__.py @@ -14,27 +14,29 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import math -import sys import argparse -from argparse import ArgumentParser -import re -from functools import wraps -from xml.sax.saxutils import quoteattr -from contextlib import contextmanager import copy +import math +import random +import re +import sys +from argparse import ArgumentParser +from contextlib import contextmanager +from functools import wraps from shlex import quote +from xml.sax.saxutils import quoteattr + from shapely.geometry import * from shapely.ops import split -import random from boxes import edges from boxes import formats -from boxes import svgutil from boxes import gears -from boxes import pulley from boxes import parts -from boxes.Color import * +from boxes import pulley +from boxes import svgutil +from boxes.Color import * + ### Helpers diff --git a/boxes/drawing.py b/boxes/drawing.py index 40973f8..ce22a1c 100644 --- a/boxes/drawing.py +++ b/boxes/drawing.py @@ -1,10 +1,11 @@ -import math import datetime -from affine import Affine -from boxes.extents import Extents -from boxes.Color import Color as bColor +import math from xml.etree import ElementTree as ET +from affine import Affine + +from boxes.extents import Extents + EPS = 1e-4 PADDING = 10 diff --git a/boxes/edges.py b/boxes/edges.py index de20d48..f5a088d 100644 --- a/boxes/edges.py +++ b/boxes/edges.py @@ -14,14 +14,15 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import math -import inspect -import argparse -import re import abc +import argparse +import inspect +import math +import re from boxes import gears + def argparseSections(s): """ Parse sections parameter diff --git a/boxes/formats.py b/boxes/formats.py index bf4c3b7..0a14123 100644 --- a/boxes/formats.py +++ b/boxes/formats.py @@ -15,12 +15,14 @@ # along with this program. If not, see . -import subprocess -import tempfile import os import shutil +import subprocess +import tempfile + from boxes.drawing import SVGSurface, PSSurface, LBRN2Surface, Context + class Formats: pstoedit_candidates = ["/usr/bin/pstoedit", "pstoedit", "pstoedit.exe"] diff --git a/boxes/gears.py b/boxes/gears.py index 1b57e89..0a857cd 100644 --- a/boxes/gears.py +++ b/boxes/gears.py @@ -40,8 +40,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Fixed https://github.com/jnweiger/inkscape-gears-dev ''' -from os import devnull # for debugging from math import pi, cos, sin, tan, radians, degrees, ceil, asin, acos, sqrt +from os import devnull # for debugging + two_pi = 2 * pi import argparse from boxes.vectors import kerf, vdiff, vlength diff --git a/boxes/generators/__init__.py b/boxes/generators/__init__.py index add5b03..8e264e9 100644 --- a/boxes/generators/__init__.py +++ b/boxes/generators/__init__.py @@ -1,6 +1,7 @@ -import pkgutil -import inspect import importlib +import inspect +import pkgutil + import boxes ui_groups_by_name = {} diff --git a/boxes/generators/agricolainsert.py b/boxes/generators/agricolainsert.py index cdd7aac..89625e2 100644 --- a/boxes/generators/agricolainsert.py +++ b/boxes/generators/agricolainsert.py @@ -16,6 +16,7 @@ import math from functools import partial + from boxes import Boxes, edges from .dividertray import ( SlotDescriptionsGenerator, diff --git a/boxes/generators/angledbox.py b/boxes/generators/angledbox.py index f9dbb2c..8ea36b7 100644 --- a/boxes/generators/angledbox.py +++ b/boxes/generators/angledbox.py @@ -15,8 +15,7 @@ # along with this program. If not, see . from boxes import * -import math -import copy + class AngledBox(Boxes): """Box with both ends cornered""" diff --git a/boxes/generators/atreus21.py b/boxes/generators/atreus21.py index 14f1c64..bc806ae 100644 --- a/boxes/generators/atreus21.py +++ b/boxes/generators/atreus21.py @@ -1,9 +1,6 @@ """Generator for a split atreus keyboard.""" -from copy import deepcopy - -from boxes import Boxes, Color, holeCol, restore, boolarg -from boxes.edges import FingerJointSettings +from boxes import Boxes, restore from .keyboard import Keyboard diff --git a/boxes/generators/bintray.py b/boxes/generators/bintray.py index 113a6cf..26c4aca 100644 --- a/boxes/generators/bintray.py +++ b/boxes/generators/bintray.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -import math, copy + class BinFrontEdge(edges.BaseEdge): char = "B" diff --git a/boxes/generators/can_storage.py b/boxes/generators/can_storage.py index 58238a0..77e298e 100644 --- a/boxes/generators/can_storage.py +++ b/boxes/generators/can_storage.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -import math + class FrontEdge(edges.BaseEdge): char = "a" diff --git a/boxes/generators/coffeecapsulesholder.py b/boxes/generators/coffeecapsulesholder.py index b344668..229a244 100644 --- a/boxes/generators/coffeecapsulesholder.py +++ b/boxes/generators/coffeecapsulesholder.py @@ -15,6 +15,7 @@ # along with this program. If not, see . import math + from boxes import Boxes, boolarg diff --git a/boxes/generators/display.py b/boxes/generators/display.py index 686cc2a..7a98a81 100644 --- a/boxes/generators/display.py +++ b/boxes/generators/display.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -import math + class Display(Boxes): """Diplay for flyers or leaflets""" diff --git a/boxes/generators/dividertray.py b/boxes/generators/dividertray.py index 36e36c2..dbc9f2c 100644 --- a/boxes/generators/dividertray.py +++ b/boxes/generators/dividertray.py @@ -14,9 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from functools import partial -from boxes import Boxes, edges, boolarg import math +from functools import partial + +from boxes import Boxes, edges, boolarg class NotchSettings(edges.Settings): diff --git a/boxes/generators/doubleflexdoorbox.py b/boxes/generators/doubleflexdoorbox.py index 4d4c07f..9185585 100644 --- a/boxes/generators/doubleflexdoorbox.py +++ b/boxes/generators/doubleflexdoorbox.py @@ -14,9 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import boxes import math +import boxes + class DoubleFlexDoorBox(boxes.Boxes): """Box with two part lid with living hinges and round corners""" diff --git a/boxes/generators/drillstand.py b/boxes/generators/drillstand.py index 911cf9f..e88a547 100644 --- a/boxes/generators/drillstand.py +++ b/boxes/generators/drillstand.py @@ -14,8 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from boxes import * import boxes +from boxes import * + class DrillStand(Boxes): """Box for drills with each compartment of a different height""" diff --git a/boxes/generators/filltest.py b/boxes/generators/filltest.py index 28baed7..714b2bd 100644 --- a/boxes/generators/filltest.py +++ b/boxes/generators/filltest.py @@ -14,11 +14,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from boxes import * -from shapely.geometry import * -import random import time +from boxes import * + + class FillTest(Boxes): # Change class name! """Piece for testing different settings for hole filling""" diff --git a/boxes/generators/flexbox.py b/boxes/generators/flexbox.py index 8da4dc6..07a5f3b 100644 --- a/boxes/generators/flexbox.py +++ b/boxes/generators/flexbox.py @@ -14,9 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import boxes import math +import boxes + class FlexBox(boxes.Boxes): """Box with living hinge and round corners""" diff --git a/boxes/generators/flexbox2.py b/boxes/generators/flexbox2.py index c395142..c3de3c6 100644 --- a/boxes/generators/flexbox2.py +++ b/boxes/generators/flexbox2.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -import math + class FlexBox2(Boxes): """Box with living hinge and top corners rounded""" diff --git a/boxes/generators/flexbox3.py b/boxes/generators/flexbox3.py index a882afc..04308a4 100644 --- a/boxes/generators/flexbox3.py +++ b/boxes/generators/flexbox3.py @@ -15,7 +15,6 @@ # along with this program. If not, see . from boxes import * -import math class FlexBox3(Boxes): diff --git a/boxes/generators/flexbox4.py b/boxes/generators/flexbox4.py index 8652a40..8da706e 100644 --- a/boxes/generators/flexbox4.py +++ b/boxes/generators/flexbox4.py @@ -15,7 +15,6 @@ # along with this program. If not, see . from boxes import * -import math class FlexBox4(Boxes): diff --git a/boxes/generators/flexbox5.py b/boxes/generators/flexbox5.py index d69c684..13b0e1c 100644 --- a/boxes/generators/flexbox5.py +++ b/boxes/generators/flexbox5.py @@ -14,9 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import boxes import math +import boxes + class FlexBox5(boxes.Boxes): """Box with living hinge and round corners""" diff --git a/boxes/generators/folder.py b/boxes/generators/folder.py index f4898b1..0c2bd16 100644 --- a/boxes/generators/folder.py +++ b/boxes/generators/folder.py @@ -15,7 +15,6 @@ # along with this program. If not, see . from boxes import * -import math class Folder(Boxes): diff --git a/boxes/generators/holepattern.py b/boxes/generators/holepattern.py index 59fe10a..fbb8850 100644 --- a/boxes/generators/holepattern.py +++ b/boxes/generators/holepattern.py @@ -15,9 +15,7 @@ # along with this program. If not, see . from boxes import * -from shapely.geometry import * -import random -import time + class HolePattern(Boxes): """Generate hole patterns in different simple shapes""" diff --git a/boxes/generators/hooks.py b/boxes/generators/hooks.py index 4d3a8b7..69fc2b7 100644 --- a/boxes/generators/hooks.py +++ b/boxes/generators/hooks.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -import math + class Hook(Boxes): """A hook wit a rectangular mouth to mount at the wall""" diff --git a/boxes/generators/jigsaw.py b/boxes/generators/jigsaw.py index 7bcfcd1..e70c2eb 100644 --- a/boxes/generators/jigsaw.py +++ b/boxes/generators/jigsaw.py @@ -15,7 +15,6 @@ # along with this program. If not, see . from boxes import * -import random class JigsawPuzzle(Boxes): # change class name here and below diff --git a/boxes/generators/keyboard.py b/boxes/generators/keyboard.py index 9c2bc3e..bc3c883 100644 --- a/boxes/generators/keyboard.py +++ b/boxes/generators/keyboard.py @@ -14,9 +14,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import re import argparse -from boxes import Boxes, boolarg +import re + +from boxes import boolarg + class Keyboard: """ diff --git a/boxes/generators/lamp.py b/boxes/generators/lamp.py index 84b96b7..b7df83c 100644 --- a/boxes/generators/lamp.py +++ b/boxes/generators/lamp.py @@ -15,7 +15,6 @@ # along with this program. If not, see . from boxes import * -import math """ 22x7.5x7cm diff --git a/boxes/generators/laptopstand.py b/boxes/generators/laptopstand.py index b9b18d0..f05f8f7 100644 --- a/boxes/generators/laptopstand.py +++ b/boxes/generators/laptopstand.py @@ -14,9 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from boxes import * from math import * +from boxes import * + class LaptopStand(Boxes): # Change class name! """A simple X shaped frame to support a laptop on a given angle""" diff --git a/boxes/generators/microrack.py b/boxes/generators/microrack.py index 5eabb8e..43c4dff 100644 --- a/boxes/generators/microrack.py +++ b/boxes/generators/microrack.py @@ -13,7 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import decimal from boxes import Boxes, edges, boolarg diff --git a/boxes/generators/organpipe.py b/boxes/generators/organpipe.py index 14f8cd1..1d094fc 100644 --- a/boxes/generators/organpipe.py +++ b/boxes/generators/organpipe.py @@ -17,8 +17,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from math import * + from boxes import * -from math import * pitches = ['c', 'c#', 'd', 'd#', 'e', 'f', 'f#', 'g', 'g#', 'a', 'a#' ,'b'] diff --git a/boxes/generators/paperbox.py b/boxes/generators/paperbox.py index db62768..0644d2c 100644 --- a/boxes/generators/paperbox.py +++ b/boxes/generators/paperbox.py @@ -15,6 +15,7 @@ # along with this program. If not, see . import math + from boxes import Boxes diff --git a/boxes/generators/phoneholder.py b/boxes/generators/phoneholder.py index 8aa5e23..6369df8 100644 --- a/boxes/generators/phoneholder.py +++ b/boxes/generators/phoneholder.py @@ -16,6 +16,7 @@ import math from functools import partial + from boxes import Boxes, edges diff --git a/boxes/generators/planetary.py b/boxes/generators/planetary.py index ff0b029..8c817f9 100644 --- a/boxes/generators/planetary.py +++ b/boxes/generators/planetary.py @@ -15,7 +15,6 @@ # along with this program. If not, see . from boxes import * -import math class Planetary(Boxes): diff --git a/boxes/generators/planetary2.py b/boxes/generators/planetary2.py index 230744a..686284c 100644 --- a/boxes/generators/planetary2.py +++ b/boxes/generators/planetary2.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -import math + class Planetary2(Boxes): diff --git a/boxes/generators/platonic.py b/boxes/generators/platonic.py index b23f751..95ab8a8 100644 --- a/boxes/generators/platonic.py +++ b/boxes/generators/platonic.py @@ -15,9 +15,8 @@ # along with this program. If not, see . from boxes import * -from boxes.edges import FingerJointBase, FingerJointEdge +from boxes.edges import FingerJointEdge -from math import sin, pi class UnevenFingerJointEdge(FingerJointEdge): """Uneven finger joint edge """ diff --git a/boxes/generators/pulley.py b/boxes/generators/pulley.py index 2be87c9..b1c3ae3 100644 --- a/boxes/generators/pulley.py +++ b/boxes/generators/pulley.py @@ -16,7 +16,6 @@ from boxes import * from boxes import pulley -import math class Pulley(Boxes): diff --git a/boxes/generators/rack10box.py b/boxes/generators/rack10box.py index e38d212..5179f02 100644 --- a/boxes/generators/rack10box.py +++ b/boxes/generators/rack10box.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from boxes import * from boxes.generators.rack19box import Rack19Box class Rack10Box(Rack19Box): diff --git a/boxes/generators/rack19halfwidth.py b/boxes/generators/rack19halfwidth.py index 3012091..5094eb6 100644 --- a/boxes/generators/rack19halfwidth.py +++ b/boxes/generators/rack19halfwidth.py @@ -1,7 +1,7 @@ """Half 19inch rack unit for musical equipment.""" from boxes import Boxes -from boxes.edges import Edge + class Rack19HalfWidth(Boxes): """Half width 19inch rack unit for musical equipment.""" diff --git a/boxes/generators/regularbox.py b/boxes/generators/regularbox.py index 7244749..518a6d6 100644 --- a/boxes/generators/regularbox.py +++ b/boxes/generators/regularbox.py @@ -16,7 +16,7 @@ from boxes import * from boxes.generators.bayonetbox import BayonetBox -import copy + class RegularBox(BayonetBox): """Box with regular polygon as base""" diff --git a/boxes/generators/regularstarbox.py b/boxes/generators/regularstarbox.py index 60e1d91..43efd51 100644 --- a/boxes/generators/regularstarbox.py +++ b/boxes/generators/regularstarbox.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -import copy + class SlotEdge(edges.Edge): diff --git a/boxes/generators/stachel.py b/boxes/generators/stachel.py index 7d9fb2c..184726d 100644 --- a/boxes/generators/stachel.py +++ b/boxes/generators/stachel.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -import math + class Stachel(Boxes): """Bass Recorder Endpin""" diff --git a/boxes/generators/trafficlight.py b/boxes/generators/trafficlight.py index 4571400..dfaab32 100644 --- a/boxes/generators/trafficlight.py +++ b/boxes/generators/trafficlight.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from boxes import * -import math + class ShadyEdge(edges.BaseEdge): char = "s" diff --git a/boxes/generators/traylayout.py b/boxes/generators/traylayout.py index 7a07a8f..c2a6e85 100644 --- a/boxes/generators/traylayout.py +++ b/boxes/generators/traylayout.py @@ -14,10 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import sys, re -from boxes import * import boxes -import argparse +from boxes import * class TrayLayout(Boxes): diff --git a/boxes/generators/ubox.py b/boxes/generators/ubox.py index dc4fc5b..83b9015 100644 --- a/boxes/generators/ubox.py +++ b/boxes/generators/ubox.py @@ -16,7 +16,7 @@ from boxes import * from boxes.lids import _TopEdge, _ChestLid -import math + class UBox(_TopEdge, _ChestLid): """Box various options for different stypes and lids""" diff --git a/boxes/generators/wallcaliperholder.py b/boxes/generators/wallcaliperholder.py index 7f1ee0b..e950d87 100644 --- a/boxes/generators/wallcaliperholder.py +++ b/boxes/generators/wallcaliperholder.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from boxes import * from boxes.walledges import _WallMountedBox class WallCaliper(_WallMountedBox): diff --git a/boxes/generators/wallconsole.py b/boxes/generators/wallconsole.py index 39d1169..aa609ec 100644 --- a/boxes/generators/wallconsole.py +++ b/boxes/generators/wallconsole.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from boxes import * from boxes.walledges import _WallMountedBox class WallConsole(_WallMountedBox): diff --git a/boxes/generators/walldrillbox.py b/boxes/generators/walldrillbox.py index 55d963d..1e7c287 100644 --- a/boxes/generators/walldrillbox.py +++ b/boxes/generators/walldrillbox.py @@ -15,8 +15,9 @@ # along with this program. If not, see . from boxes import * -from .drillstand import DrillStand from boxes.walledges import _WallMountedBox +from .drillstand import DrillStand + class WallDrillBox(DrillStand, _WallMountedBox): """Box for drills with each compartment with a different height""" diff --git a/boxes/generators/walledges.py b/boxes/generators/walledges.py index 9369ac3..d1329c8 100644 --- a/boxes/generators/walledges.py +++ b/boxes/generators/walledges.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from boxes import * from boxes.walledges import _WallMountedBox class WallEdges(_WallMountedBox): diff --git a/boxes/generators/wallplaneholder.py b/boxes/generators/wallplaneholder.py index d78372a..56bca54 100644 --- a/boxes/generators/wallplaneholder.py +++ b/boxes/generators/wallplaneholder.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from boxes import * from boxes.walledges import _WallMountedBox class WallPlaneHolder(_WallMountedBox): diff --git a/boxes/generators/wallstairs.py b/boxes/generators/wallstairs.py index a64704f..dbf80ca 100644 --- a/boxes/generators/wallstairs.py +++ b/boxes/generators/wallstairs.py @@ -14,7 +14,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from boxes import * from boxes.walledges import _WallMountedBox class WallStairs(_WallMountedBox): diff --git a/boxes/parts.py b/boxes/parts.py index 9487bb3..cab2d08 100644 --- a/boxes/parts.py +++ b/boxes/parts.py @@ -1,6 +1,8 @@ from math import * + from boxes import vectors + def arcOnCircle(spanning_angle, outgoing_angle, r=1.0): angle = spanning_angle + 2 * outgoing_angle radius = r * sin(radians(0.5 * spanning_angle)) / sin(radians(180 - outgoing_angle - 0.5 * spanning_angle)) diff --git a/boxes/pulley.py b/boxes/pulley.py index 27c5c7b..7344ded 100644 --- a/boxes/pulley.py +++ b/boxes/pulley.py @@ -12,6 +12,7 @@ // pulley diameter checked and modelled from data at http://www.sdp-si.com/D265/HTML/D265T016.html """ from math import * + from boxes.vectors import * diff --git a/boxes/robot.py b/boxes/robot.py index 9392ff5..22c07b9 100644 --- a/boxes/robot.py +++ b/boxes/robot.py @@ -1,5 +1,3 @@ -import boxes - __all__ = [ "RobotArg", "RobotArmMM", diff --git a/boxes/servos.py b/boxes/servos.py index 41e69b7..5b04f15 100644 --- a/boxes/servos.py +++ b/boxes/servos.py @@ -1,6 +1,8 @@ -import boxes.vectors import math +import boxes.vectors + + class EyeEdge(boxes.edges.FingerHoleEdge): char = "m" diff --git a/boxes/svgutil.py b/boxes/svgutil.py index e2e4305..7be7074 100755 --- a/boxes/svgutil.py +++ b/boxes/svgutil.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import re, datetime +import re from xml.etree import ElementTree ElementTree.register_namespace("","http://www.w3.org/2000/svg") @@ -76,7 +76,6 @@ def svgMerge(box, inkscape, output): off_y = (src_view[1]+src_view[3]) * -scale_y + dest_height * scale_y for el in src_tree.getroot(): - import sys dest_root.append(el) if el.tag.endswith("g"): el.set("transform", "matrix(%f,0,0,%f, %f, %f)" % ( diff --git a/boxes/walledges.py b/boxes/walledges.py index 879cba0..a564d78 100644 --- a/boxes/walledges.py +++ b/boxes/walledges.py @@ -1,7 +1,9 @@ -from .edges import Settings, BaseEdge -from boxes import Boxes, edges import math +from boxes import Boxes, edges +from .edges import Settings, BaseEdge + + class _WallMountedBox(Boxes): ui_group = "WallMounted" diff --git a/scripts/boxes2inkscape b/scripts/boxes2inkscape index 438c97c..fe8462e 100755 --- a/scripts/boxes2inkscape +++ b/scripts/boxes2inkscape @@ -14,11 +14,10 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import sys import argparse import os.path +import sys from xml.sax.saxutils import quoteattr -from urllib.parse import unquote_plus try: import boxes.generators diff --git a/scripts/boxes2pot b/scripts/boxes2pot index 438601f..753e419 100755 --- a/scripts/boxes2pot +++ b/scripts/boxes2pot @@ -14,9 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import sys -import os.path import argparse +import os.path +import sys try: import boxes.generators diff --git a/scripts/boxesserver b/scripts/boxesserver index cb32bb9..6e4560d 100755 --- a/scripts/boxesserver +++ b/scripts/boxesserver @@ -14,25 +14,23 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import sys import argparse -import html -import tempfile -import os.path -import threading -import time -import codecs -import mimetypes -import re -import markdown import gettext import glob +import html +import mimetypes +import os.path +import re +import sys +import tempfile +import threading +import time import traceback -from urllib.parse import unquote_plus, quote from urllib.parse import parse_qs -from wsgiref.util import setup_testing_defaults +from urllib.parse import unquote_plus, quote from wsgiref.simple_server import make_server -import wsgiref.util + +import markdown try: import boxes.generators