summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gerber/__main__.py6
-rw-r--r--gerber/common.py6
-rw-r--r--gerber/render/__init__.py4
-rw-r--r--gerber/tests/test_cam.py2
-rw-r--r--gerber/tests/test_common.py2
-rw-r--r--gerber/tests/test_primitives.py2
-rw-r--r--gerber/tests/test_rs274x.py2
-rw-r--r--setup.py2
8 files changed, 13 insertions, 13 deletions
diff --git a/gerber/__main__.py b/gerber/__main__.py
index 8f20212..a792182 100644
--- a/gerber/__main__.py
+++ b/gerber/__main__.py
@@ -16,8 +16,8 @@
# the License.
if __name__ == '__main__':
- from .common import read
- from .render import GerberSvgContext
+ from gerber.common import read
+ from gerber.render import GerberSvgContext
import sys
if len(sys.argv) < 2:
@@ -27,7 +27,7 @@ if __name__ == '__main__':
ctx = GerberSvgContext()
ctx.alpha = 0.95
for filename in sys.argv[1:]:
- print "parsing %s" % filename
+ print("parsing %s" % filename)
if 'GTO' in filename or 'GBO' in filename:
ctx.color = (1, 1, 1)
ctx.alpha = 0.8
diff --git a/gerber/common.py b/gerber/common.py
index 83e3cb0..78da2cd 100644
--- a/gerber/common.py
+++ b/gerber/common.py
@@ -30,9 +30,9 @@ def read(filename):
CncFile object representing the file, either GerberFile or
ExcellonFile. Returns None if file is not an Excellon or Gerber file.
"""
- import rs274x
- import excellon
- from utils import detect_file_format
+ from . import rs274x
+ from . import excellon
+ from .utils import detect_file_format
fmt = detect_file_format(filename)
if fmt == 'rs274x':
return rs274x.read(filename)
diff --git a/gerber/render/__init__.py b/gerber/render/__init__.py
index b4af4ad..1e60792 100644
--- a/gerber/render/__init__.py
+++ b/gerber/render/__init__.py
@@ -24,5 +24,5 @@ SVG is the only supported format.
"""
-from svgwrite_backend import GerberSvgContext
-from cairo_backend import GerberCairoContext
+from .svgwrite_backend import GerberSvgContext
+from .cairo_backend import GerberCairoContext
diff --git a/gerber/tests/test_cam.py b/gerber/tests/test_cam.py
index 6296cc9..00a8285 100644
--- a/gerber/tests/test_cam.py
+++ b/gerber/tests/test_cam.py
@@ -4,7 +4,7 @@
# Author: Hamilton Kibbe <ham@hamiltonkib.be>
from ..cam import CamFile, FileSettings
-from tests import *
+from .tests import *
def test_filesettings_defaults():
diff --git a/gerber/tests/test_common.py b/gerber/tests/test_common.py
index bf9760a..76e3991 100644
--- a/gerber/tests/test_common.py
+++ b/gerber/tests/test_common.py
@@ -5,7 +5,7 @@
from ..common import read
from ..excellon import ExcellonFile
from ..rs274x import GerberFile
-from tests import *
+from .tests import *
import os
diff --git a/gerber/tests/test_primitives.py b/gerber/tests/test_primitives.py
index cada6d4..dab0225 100644
--- a/gerber/tests/test_primitives.py
+++ b/gerber/tests/test_primitives.py
@@ -3,7 +3,7 @@
# Author: Hamilton Kibbe <ham@hamiltonkib.be>
from ..primitives import *
-from tests import *
+from .tests import *
def test_primitive_implementation_warning():
diff --git a/gerber/tests/test_rs274x.py b/gerber/tests/test_rs274x.py
index 27f6f49..5185fa1 100644
--- a/gerber/tests/test_rs274x.py
+++ b/gerber/tests/test_rs274x.py
@@ -5,7 +5,7 @@
import os
from ..rs274x import read, GerberFile
-from tests import *
+from .tests import *
TOP_COPPER_FILE = os.path.join(os.path.dirname(__file__),
diff --git a/setup.py b/setup.py
index 3e3fbb2..03c354c 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ METADATA = {
'license': "Apache",
'keywords': "gerber tools",
'url': "http://github.com/curtacircuitos/gerber-tools",
- 'packages': ['gerber'],
+ 'packages': ['gerber', 'gerber.render'],
'long_description': read('README.md'),
'classifiers':[
"Development Status :: 3 - Alpha",