diff options
| author | Lex Neva <github.com@lexneva.name> | 2018-05-01 20:37:51 -0400 |
|---|---|---|
| committer | Lex Neva <github.com@lexneva.name> | 2018-05-01 20:37:51 -0400 |
| commit | 1b31806423c8fec4040fed6d1009db016860b763 (patch) | |
| tree | 71ccac169471e76685a7fa0b9910f64555dc73a7 | |
| parent | 5b7f14d092456a941dbd189e61ed38d9b16d388b (diff) | |
rename inkstitch/ to lib/
You can't have a module and a package named the same thing. PyInstaller wants
to import the main script as if it were a module, and this doesn't work unless
there's no directory of the same name with a __init__.py in it.
| -rw-r--r-- | inkstitch.py | 4 | ||||
| -rw-r--r-- | lib/__init__.py (renamed from inkstitch/__init__.py) | 4 | ||||
| -rw-r--r-- | lib/elements/__init__.py (renamed from inkstitch/elements/__init__.py) | 0 | ||||
| -rw-r--r-- | lib/elements/auto_fill.py (renamed from inkstitch/elements/auto_fill.py) | 0 | ||||
| -rw-r--r-- | lib/elements/element.py (renamed from inkstitch/elements/element.py) | 0 | ||||
| -rw-r--r-- | lib/elements/fill.py (renamed from inkstitch/elements/fill.py) | 0 | ||||
| -rw-r--r-- | lib/elements/polyline.py (renamed from inkstitch/elements/polyline.py) | 0 | ||||
| -rw-r--r-- | lib/elements/satin_column.py (renamed from inkstitch/elements/satin_column.py) | 0 | ||||
| -rw-r--r-- | lib/elements/stroke.py (renamed from inkstitch/elements/stroke.py) | 0 | ||||
| -rw-r--r-- | lib/extensions/__init__.py (renamed from inkstitch/extensions/__init__.py) | 0 | ||||
| -rw-r--r-- | lib/extensions/base.py (renamed from inkstitch/extensions/base.py) | 0 | ||||
| -rw-r--r-- | lib/extensions/embroider.py (renamed from inkstitch/extensions/embroider.py) | 0 | ||||
| -rw-r--r-- | lib/extensions/input.py (renamed from inkstitch/extensions/input.py) | 0 | ||||
| -rw-r--r-- | lib/extensions/palettes.py (renamed from inkstitch/extensions/palettes.py) | 0 | ||||
| -rw-r--r-- | lib/extensions/params.py (renamed from inkstitch/extensions/params.py) | 0 | ||||
| -rw-r--r-- | lib/extensions/print_pdf.py (renamed from inkstitch/extensions/print_pdf.py) | 0 | ||||
| -rw-r--r-- | lib/extensions/simulate.py (renamed from inkstitch/extensions/simulate.py) | 0 | ||||
| -rw-r--r-- | lib/simulator.py (renamed from inkstitch/simulator.py) | 0 | ||||
| -rw-r--r-- | lib/stitch_plan/__init__.py (renamed from inkstitch/stitch_plan/__init__.py) | 0 | ||||
| -rw-r--r-- | lib/stitch_plan/stitch_plan.py (renamed from inkstitch/stitch_plan/stitch_plan.py) | 0 | ||||
| -rw-r--r-- | lib/stitch_plan/stop.py (renamed from inkstitch/stitch_plan/stop.py) | 0 | ||||
| -rw-r--r-- | lib/stitch_plan/ties.py (renamed from inkstitch/stitch_plan/ties.py) | 0 | ||||
| -rw-r--r-- | lib/stitch_plan/trim.py (renamed from inkstitch/stitch_plan/trim.py) | 0 | ||||
| -rw-r--r-- | lib/stitches/__init__.py (renamed from inkstitch/stitches/__init__.py) | 0 | ||||
| -rw-r--r-- | lib/stitches/auto_fill.py (renamed from inkstitch/stitches/auto_fill.py) | 0 | ||||
| -rw-r--r-- | lib/stitches/fill.py (renamed from inkstitch/stitches/fill.py) | 0 | ||||
| -rw-r--r-- | lib/stitches/running_stitch.py (renamed from inkstitch/stitches/running_stitch.py) | 0 | ||||
| -rw-r--r-- | lib/svg.py (renamed from inkstitch/svg.py) | 0 | ||||
| -rw-r--r-- | lib/threads/__init__.py (renamed from inkstitch/threads/__init__.py) | 0 | ||||
| -rw-r--r-- | lib/threads/catalog.py (renamed from inkstitch/threads/catalog.py) | 0 | ||||
| -rw-r--r-- | lib/threads/color.py (renamed from inkstitch/threads/color.py) | 0 | ||||
| -rw-r--r-- | lib/threads/palette.py (renamed from inkstitch/threads/palette.py) | 0 | ||||
| -rw-r--r-- | lib/utils/__init__.py (renamed from inkstitch/utils/__init__.py) | 0 | ||||
| -rw-r--r-- | lib/utils/cache.py (renamed from inkstitch/utils/cache.py) | 0 | ||||
| -rw-r--r-- | lib/utils/geometry.py (renamed from inkstitch/utils/geometry.py) | 0 | ||||
| -rw-r--r-- | lib/utils/inkscape.py (renamed from inkstitch/utils/inkscape.py) | 0 | ||||
| -rw-r--r-- | lib/utils/io.py (renamed from inkstitch/utils/io.py) | 0 |
37 files changed, 4 insertions, 4 deletions
diff --git a/inkstitch.py b/inkstitch.py index fe8d6ecb..a9ce829e 100644 --- a/inkstitch.py +++ b/inkstitch.py @@ -1,8 +1,8 @@ import sys import traceback from argparse import ArgumentParser -from inkstitch.utils import save_stderr, restore_stderr -from inkstitch import extensions +from lib.utils import save_stderr, restore_stderr +from lib import extensions parser = ArgumentParser() diff --git a/inkstitch/__init__.py b/lib/__init__.py index 45eed3a6..2c0ee620 100644 --- a/inkstitch/__init__.py +++ b/lib/__init__.py @@ -7,8 +7,8 @@ import gettext from copy import deepcopy import math import libembroidery -from inkstitch.utils import cache -from inkstitch.utils.geometry import Point +from .utils import cache +from .utils.geometry import Point import inkex import simplepath diff --git a/inkstitch/elements/__init__.py b/lib/elements/__init__.py index 7e05e19c..7e05e19c 100644 --- a/inkstitch/elements/__init__.py +++ b/lib/elements/__init__.py diff --git a/inkstitch/elements/auto_fill.py b/lib/elements/auto_fill.py index 6eb1f10c..6eb1f10c 100644 --- a/inkstitch/elements/auto_fill.py +++ b/lib/elements/auto_fill.py diff --git a/inkstitch/elements/element.py b/lib/elements/element.py index cfca3782..cfca3782 100644 --- a/inkstitch/elements/element.py +++ b/lib/elements/element.py diff --git a/inkstitch/elements/fill.py b/lib/elements/fill.py index a74a897d..a74a897d 100644 --- a/inkstitch/elements/fill.py +++ b/lib/elements/fill.py diff --git a/inkstitch/elements/polyline.py b/lib/elements/polyline.py index 6ded9fd1..6ded9fd1 100644 --- a/inkstitch/elements/polyline.py +++ b/lib/elements/polyline.py diff --git a/inkstitch/elements/satin_column.py b/lib/elements/satin_column.py index d22f5145..d22f5145 100644 --- a/inkstitch/elements/satin_column.py +++ b/lib/elements/satin_column.py diff --git a/inkstitch/elements/stroke.py b/lib/elements/stroke.py index 360e3744..360e3744 100644 --- a/inkstitch/elements/stroke.py +++ b/lib/elements/stroke.py diff --git a/inkstitch/extensions/__init__.py b/lib/extensions/__init__.py index ebdd2fc9..ebdd2fc9 100644 --- a/inkstitch/extensions/__init__.py +++ b/lib/extensions/__init__.py diff --git a/inkstitch/extensions/base.py b/lib/extensions/base.py index 91e050eb..91e050eb 100644 --- a/inkstitch/extensions/base.py +++ b/lib/extensions/base.py diff --git a/inkstitch/extensions/embroider.py b/lib/extensions/embroider.py index 564e96ca..564e96ca 100644 --- a/inkstitch/extensions/embroider.py +++ b/lib/extensions/embroider.py diff --git a/inkstitch/extensions/input.py b/lib/extensions/input.py index bd3db0ed..bd3db0ed 100644 --- a/inkstitch/extensions/input.py +++ b/lib/extensions/input.py diff --git a/inkstitch/extensions/palettes.py b/lib/extensions/palettes.py index 269dc6dc..269dc6dc 100644 --- a/inkstitch/extensions/palettes.py +++ b/lib/extensions/palettes.py diff --git a/inkstitch/extensions/params.py b/lib/extensions/params.py index 881dab49..881dab49 100644 --- a/inkstitch/extensions/params.py +++ b/lib/extensions/params.py diff --git a/inkstitch/extensions/print_pdf.py b/lib/extensions/print_pdf.py index 5d462c0f..5d462c0f 100644 --- a/inkstitch/extensions/print_pdf.py +++ b/lib/extensions/print_pdf.py diff --git a/inkstitch/extensions/simulate.py b/lib/extensions/simulate.py index 75bc62c7..75bc62c7 100644 --- a/inkstitch/extensions/simulate.py +++ b/lib/extensions/simulate.py diff --git a/inkstitch/simulator.py b/lib/simulator.py index cc9442ea..cc9442ea 100644 --- a/inkstitch/simulator.py +++ b/lib/simulator.py diff --git a/inkstitch/stitch_plan/__init__.py b/lib/stitch_plan/__init__.py index 6c1f418a..6c1f418a 100644 --- a/inkstitch/stitch_plan/__init__.py +++ b/lib/stitch_plan/__init__.py diff --git a/inkstitch/stitch_plan/stitch_plan.py b/lib/stitch_plan/stitch_plan.py index fab87876..fab87876 100644 --- a/inkstitch/stitch_plan/stitch_plan.py +++ b/lib/stitch_plan/stitch_plan.py diff --git a/inkstitch/stitch_plan/stop.py b/lib/stitch_plan/stop.py index c5e9f7e4..c5e9f7e4 100644 --- a/inkstitch/stitch_plan/stop.py +++ b/lib/stitch_plan/stop.py diff --git a/inkstitch/stitch_plan/ties.py b/lib/stitch_plan/ties.py index 1207ea51..1207ea51 100644 --- a/inkstitch/stitch_plan/ties.py +++ b/lib/stitch_plan/ties.py diff --git a/inkstitch/stitch_plan/trim.py b/lib/stitch_plan/trim.py index f692a179..f692a179 100644 --- a/inkstitch/stitch_plan/trim.py +++ b/lib/stitch_plan/trim.py diff --git a/inkstitch/stitches/__init__.py b/lib/stitches/__init__.py index d2ff0446..d2ff0446 100644 --- a/inkstitch/stitches/__init__.py +++ b/lib/stitches/__init__.py diff --git a/inkstitch/stitches/auto_fill.py b/lib/stitches/auto_fill.py index 7f265909..7f265909 100644 --- a/inkstitch/stitches/auto_fill.py +++ b/lib/stitches/auto_fill.py diff --git a/inkstitch/stitches/fill.py b/lib/stitches/fill.py index 1b7377b0..1b7377b0 100644 --- a/inkstitch/stitches/fill.py +++ b/lib/stitches/fill.py diff --git a/inkstitch/stitches/running_stitch.py b/lib/stitches/running_stitch.py index 81124339..81124339 100644 --- a/inkstitch/stitches/running_stitch.py +++ b/lib/stitches/running_stitch.py diff --git a/inkstitch/svg.py b/lib/svg.py index 0728309b..0728309b 100644 --- a/inkstitch/svg.py +++ b/lib/svg.py diff --git a/inkstitch/threads/__init__.py b/lib/threads/__init__.py index 03cd777b..03cd777b 100644 --- a/inkstitch/threads/__init__.py +++ b/lib/threads/__init__.py diff --git a/inkstitch/threads/catalog.py b/lib/threads/catalog.py index cebae4ff..cebae4ff 100644 --- a/inkstitch/threads/catalog.py +++ b/lib/threads/catalog.py diff --git a/inkstitch/threads/color.py b/lib/threads/color.py index af474127..af474127 100644 --- a/inkstitch/threads/color.py +++ b/lib/threads/color.py diff --git a/inkstitch/threads/palette.py b/lib/threads/palette.py index e1f47c7f..e1f47c7f 100644 --- a/inkstitch/threads/palette.py +++ b/lib/threads/palette.py diff --git a/inkstitch/utils/__init__.py b/lib/utils/__init__.py index ff06d4a9..ff06d4a9 100644 --- a/inkstitch/utils/__init__.py +++ b/lib/utils/__init__.py diff --git a/inkstitch/utils/cache.py b/lib/utils/cache.py index 38fe8f2c..38fe8f2c 100644 --- a/inkstitch/utils/cache.py +++ b/lib/utils/cache.py diff --git a/inkstitch/utils/geometry.py b/lib/utils/geometry.py index 61b98bcb..61b98bcb 100644 --- a/inkstitch/utils/geometry.py +++ b/lib/utils/geometry.py diff --git a/inkstitch/utils/inkscape.py b/lib/utils/inkscape.py index 2d0298bc..2d0298bc 100644 --- a/inkstitch/utils/inkscape.py +++ b/lib/utils/inkscape.py diff --git a/inkstitch/utils/io.py b/lib/utils/io.py index e87b9881..e87b9881 100644 --- a/inkstitch/utils/io.py +++ b/lib/utils/io.py |
