diff options
| author | Lex Neva <lexelby@users.noreply.github.com> | 2018-08-24 20:52:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-24 20:52:28 -0400 |
| commit | 1de8487849a3f8f55d126e2687d690226e657fde (patch) | |
| tree | 1bd891b97f8447cb3f513d073d20cea5d4534461 /lib/threads | |
| parent | b3bb975401fe4971170239eea9b928ee13161398 (diff) | |
| parent | 91eb98cc33602f19dddc186c034aed968e048404 (diff) | |
Merge pull request #288 from inkstitch/lexelby/style
fix coding style and enforce style checks in build
Diffstat (limited to 'lib/threads')
| -rw-r--r-- | lib/threads/catalog.py | 2 | ||||
| -rw-r--r-- | lib/threads/color.py | 1 | ||||
| -rw-r--r-- | lib/threads/palette.py | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/lib/threads/catalog.py b/lib/threads/catalog.py index d9981dc6..ece2f8ac 100644 --- a/lib/threads/catalog.py +++ b/lib/threads/catalog.py @@ -85,8 +85,10 @@ class _ThreadCatalog(Sequence): if palette.name == name: return palette + _catalog = None + def ThreadCatalog(): """Singleton _ThreadCatalog factory""" diff --git a/lib/threads/color.py b/lib/threads/color.py index cc6c0c48..8c596e44 100644 --- a/lib/threads/color.py +++ b/lib/threads/color.py @@ -3,6 +3,7 @@ import re import colorsys from pyembroidery.EmbThread import EmbThread + class ThreadColor(object): hex_str_re = re.compile('#([0-9a-z]{3}|[0-9a-z]{6})', re.I) diff --git a/lib/threads/palette.py b/lib/threads/palette.py index 785fb082..654c43e5 100644 --- a/lib/threads/palette.py +++ b/lib/threads/palette.py @@ -41,8 +41,11 @@ class ThreadPalette(Set): if self.name.lower().startswith('name: ink/stitch: '): self.name = self.name[18:] - columns_line = palette.readline() - headers_line = palette.readline() + # number of columns + palette.readline() + + # headers + palette.readline() for line in palette: fields = line.split("\t", 3) |
