Manual merge resolution

1 files changed, 10 insertions, 13 deletions

diff --git a/gerber/tests/test_common.py b/gerber/tests/test_common.py
index 0224c48..a6b1264 100644
--- a/gerber/tests/test_common.py
+++ b/gerber/tests/test_common.py
@@ -6,15 +6,12 @@ from ..exceptions import ParseError
 from ..common import read, loads
 from ..excellon import ExcellonFile
 from ..rs274x import GerberFile
-from .tests import *
-
 import os
+import pytest
 
 
-NCDRILL_FILE = os.path.join(os.path.dirname(__file__),
-                            'resources/ncdrill.DRD')
-TOP_COPPER_FILE = os.path.join(os.path.dirname(__file__),
-                               'resources/top_copper.GTL')
+NCDRILL_FILE = os.path.join(os.path.dirname(__file__), "resources/ncdrill.DRD")
+TOP_COPPER_FILE = os.path.join(os.path.dirname(__file__), "resources/top_copper.GTL")
 
 
 def test_file_type_detection():
@@ -22,20 +19,20 @@ def test_file_type_detection():
     """
     ncdrill = read(NCDRILL_FILE)
     top_copper = read(TOP_COPPER_FILE)
-    assert_true(isinstance(ncdrill, ExcellonFile))
-    assert_true(isinstance(top_copper, GerberFile))
+    assert isinstance(ncdrill, ExcellonFile)
+    assert isinstance(top_copper, GerberFile)
 
 
 def test_load_from_string():
-    with open(NCDRILL_FILE, 'rU') as f:
+    with open(NCDRILL_FILE, "rU") as f:
         ncdrill = loads(f.read())
-    with open(TOP_COPPER_FILE, 'rU') as f:
+    with open(TOP_COPPER_FILE, "rU") as f:
         top_copper = loads(f.read())
-    assert_true(isinstance(ncdrill, ExcellonFile))
-    assert_true(isinstance(top_copper, GerberFile))
+    assert isinstance(ncdrill, ExcellonFile)
+    assert isinstance(top_copper, GerberFile)
 
 
 def test_file_type_validation():
     """ Test file format validation
     """
-    assert_raises(ParseError, read, __file__)
+    pytest.raises(ParseError, read, __file__)