summaryrefslogtreecommitdiff
path: root/gerber/tests
diff options
context:
space:
mode:
authorHamilton Kibbe <hamilton.kibbe@gmail.com>2015-02-18 21:14:30 -0500
committerHamilton Kibbe <hamilton.kibbe@gmail.com>2015-02-18 21:14:30 -0500
commite71d7a24b5be3e68d36494869595eec934db4bd2 (patch)
treef48e714895acaecedc4d8bdf323b01a8c2a043c1 /gerber/tests
parent8e4fc555048d411c2d7c894a1e44d4ea73e821a8 (diff)
downloadgerbonara-e71d7a24b5be3e68d36494869595eec934db4bd2.tar.gz
gerbonara-e71d7a24b5be3e68d36494869595eec934db4bd2.tar.bz2
gerbonara-e71d7a24b5be3e68d36494869595eec934db4bd2.zip
Python 3 tests passing
Diffstat (limited to 'gerber/tests')
-rw-r--r--gerber/tests/test_excellon.py6
-rw-r--r--gerber/tests/test_gerber_statements.py3
-rw-r--r--gerber/tests/tests.py2
3 files changed, 6 insertions, 5 deletions
diff --git a/gerber/tests/test_excellon.py b/gerber/tests/test_excellon.py
index 24cf793..d47ad6a 100644
--- a/gerber/tests/test_excellon.py
+++ b/gerber/tests/test_excellon.py
@@ -7,7 +7,7 @@ import os
from ..cam import FileSettings
from ..excellon import read, detect_excellon_format, ExcellonFile, ExcellonParser
from ..excellon_statements import ExcellonTool
-from tests import *
+from .tests import *
NCDRILL_FILE = os.path.join(os.path.dirname(__file__),
@@ -47,14 +47,14 @@ def test_conversion():
ncdrill.to_metric()
assert_equal(ncdrill.settings.units, 'metric')
- for tool in ncdrill_inch.tools.itervalues():
+ for tool in iter(ncdrill_inch.tools.values()):
tool.to_metric()
for primitive in ncdrill_inch.primitives:
primitive.to_metric()
for statement in ncdrill_inch.statements:
statement.to_metric()
- for m_tool, i_tool in zip(ncdrill.tools.itervalues(), ncdrill_inch.tools.itervalues()):
+ for m_tool, i_tool in zip(iter(ncdrill.tools.values()), iter(ncdrill_inch.tools.values())):
assert_equal(i_tool, m_tool)
for m, i in zip(ncdrill.primitives,ncdrill_inch.primitives):
diff --git a/gerber/tests/test_gerber_statements.py b/gerber/tests/test_gerber_statements.py
index bf7035f..b473cf9 100644
--- a/gerber/tests/test_gerber_statements.py
+++ b/gerber/tests/test_gerber_statements.py
@@ -539,7 +539,8 @@ def test_statement_string():
stmt = Statement('PARAM')
assert_equal(str(stmt), '<Statement type=PARAM>')
stmt.test='PASS'
- assert_equal(str(stmt), '<Statement test=PASS type=PARAM>')
+ assert_true('test=PASS' in str(stmt))
+ assert_true('type=PARAM' in str(stmt))
def test_ADParamStmt_factory():
diff --git a/gerber/tests/tests.py b/gerber/tests/tests.py
index db02949..2c75acd 100644
--- a/gerber/tests/tests.py
+++ b/gerber/tests/tests.py
@@ -20,5 +20,5 @@ __all__ = ['assert_in', 'assert_not_in', 'assert_equal', 'assert_not_equal',
def assert_array_almost_equal(arr1, arr2, decimal=6):
assert_equal(len(arr1), len(arr2))
- for i in xrange(len(arr1)):
+ for i in range(len(arr1)):
assert_almost_equal(arr1[i], arr2[i], decimal)