From f9bb8d351aba420eb43db5a29b4ad97606998596 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 8 Jul 2014 11:08:45 +0100
Subject: Run pyflakes during test and fix errors

---
 mammoth/__init__.py              | 1 -
 mammoth/conversion.py            | 1 -
 mammoth/docx/__init__.py         | 1 -
 mammoth/docx/document_xml.py     | 4 ++--
 mammoth/style_reader/__init__.py | 3 +++
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'mammoth')

diff --git a/mammoth/__init__.py b/mammoth/__init__.py
index 4a3643c..889cdd5 100644
--- a/mammoth/__init__.py
+++ b/mammoth/__init__.py
@@ -1,4 +1,3 @@
-from .results import Result
 from . import docx, conversion, options, documents, images
 
 __all__ = ["convert_to_html", "extract_raw_text", "images"]
diff --git a/mammoth/conversion.py b/mammoth/conversion.py
index 715e5e0..a9fba51 100644
--- a/mammoth/conversion.py
+++ b/mammoth/conversion.py
@@ -1,5 +1,4 @@
 import base64
-import io
 
 from . import documents, results, html_paths, images
 from .html_generation import HtmlGenerator, satisfy_html_path
diff --git a/mammoth/docx/__init__.py b/mammoth/docx/__init__.py
index c0a7ea3..df3071d 100644
--- a/mammoth/docx/__init__.py
+++ b/mammoth/docx/__init__.py
@@ -1,7 +1,6 @@
 import zipfile
 import contextlib
 
-from ..results import Result
 from .xmlparser import parse_xml
 from .document_xml import read_document_xml_element
 from .content_types_xml import read_content_types_xml_element
diff --git a/mammoth/docx/document_xml.py b/mammoth/docx/document_xml.py
index 83ddcdd..75d21fb 100644
--- a/mammoth/docx/document_xml.py
+++ b/mammoth/docx/document_xml.py
@@ -129,13 +129,13 @@ def _create_reader(numbering, content_types, relationships, styles, docx_file):
     
     
     @handler("w:tr")
-    def table(element):
+    def table_row(element):
         return _read_xml_elements(element.children) \
             .map(documents.table_row)
     
     
     @handler("w:tc")
-    def table(element):
+    def table_cell(element):
         return _read_xml_elements(element.children) \
             .map(documents.table_cell)
     
diff --git a/mammoth/style_reader/__init__.py b/mammoth/style_reader/__init__.py
index 41dcffa..28281a8 100644
--- a/mammoth/style_reader/__init__.py
+++ b/mammoth/style_reader/__init__.py
@@ -5,6 +5,9 @@ from .document_matcher_reader import read_document_matcher, grammar_text as docu
 from ..styles import Style
 
 
+__all__ = ["read_style", "read_html_path", "read_document_matcher"]
+
+
 def read_style(string):
     style_node = _grammar.parse(string)
     return _read_style_node(style_node)
-- 
cgit v1.2.3