py3: last few tweaks to get clean tox run

Steve Canny · Steve Canny · commit 31470af6d4c9 · 2014-01-07T08:06:55.000-08:00
* Python 3 doesn't like the relative import of helpers
* neglected to open test stream in binary mode
diff --git a/features/steps/api.py b/features/steps/api.py
@@ -9,7 +9,7 @@
 from docx.shared import Inches
 from docx.table import Table
 
-from .helpers import test_file_path
+from helpers import test_file_path
 
 
 # when ====================================================
diff --git a/features/steps/block.py b/features/steps/block.py
@@ -9,7 +9,7 @@
 from docx import Document
 from docx.table import Table
 
-from .helpers import test_docx
+from helpers import test_docx
 
 
 # given ===================================================
diff --git a/features/steps/paragraph.py b/features/steps/paragraph.py
@@ -8,7 +8,7 @@
 
 from docx import Document
 
-from .helpers import saved_docx_path, test_text
+from helpers import saved_docx_path, test_text
 
 test_style = 'Heading1'
 
diff --git a/features/steps/shape.py b/features/steps/shape.py
@@ -15,7 +15,7 @@
 from docx.parts.document import InlineShape, InlineShapes
 from docx.shared import Inches
 
-from .helpers import test_docx, test_file_path
+from helpers import test_docx, test_file_path
 
 
 # given ===================================================
@@ -58,7 +58,7 @@ def given_inline_shape_known_to_be_shape_of_type(context, shp_of_type):
 @when('I add an inline picture from a file-like object')
 def when_add_inline_picture_from_file_like_object(context):
     document = context.document
-    with open(test_file_path('monty-truth.png')) as f:
+    with open(test_file_path('monty-truth.png'), 'rb') as f:
         context.inline_shape = document.inline_shapes.add_picture(f)
 
 
diff --git a/features/steps/shared.py b/features/steps/shared.py
@@ -10,7 +10,7 @@
 
 from docx import Document
 
-from .helpers import saved_docx_path
+from helpers import saved_docx_path
 
 
 # given ===================================================
diff --git a/features/steps/table.py b/features/steps/table.py
@@ -13,7 +13,7 @@
     _Cell, _Column, _ColumnCells, _Columns, _Row, _RowCells, _Rows
 )
 
-from .helpers import test_docx
+from helpers import test_docx
 
 
 # given ===================================================
diff --git a/tox.ini b/tox.ini
@@ -1,11 +1,4 @@
 #
-# tox.ini
-#
-# Copyright (C) 2012, 2013 Steve Canny scanny@cisco.com
-#
-# This module is part of python-docx and is released under the MIT License:
-# http://www.opensource.org/licenses/mit-license.php
-#
 # Configuration for tox and pytest
 
 [pytest]

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`_Cell, _Column, _ColumnCells, _Columns, _Row, _RowCells, _Rows`
`14`	`14`	`)`
`15`	`15`
`16`		`-from .helpers import test_docx`
	`16`	`+from helpers import test_docx`
`17`	`17`
`18`	`18`
`19`	`19`	`# given ===================================================`