Convert openpyxl to relative imports

7 files changed, 57 insertions, 57 deletions

diff --git a/tablib/packages/openpyxl/reader/__init__.py b/tablib/packages/openpyxl/reader/__init__.py
index a45d67e..9b0ee2f 100644
--- a/tablib/packages/openpyxl/reader/__init__.py
+++ b/tablib/packages/openpyxl/reader/__init__.py
@@ -26,8 +26,8 @@
 """Imports for the openpyxl.reader namespace."""
 
 # package imports
-from openpyxl.reader import excel
-from openpyxl.reader import strings
-from openpyxl.reader import style
-from openpyxl.reader import workbook
-from openpyxl.reader import worksheet
+from ..reader import excel
+from ..reader import strings
+from ..reader import style
+from ..reader import workbook
+from ..reader import worksheet
diff --git a/tablib/packages/openpyxl/reader/excel.py b/tablib/packages/openpyxl/reader/excel.py
index ba633e6..3dc6547 100644
--- a/tablib/packages/openpyxl/reader/excel.py
+++ b/tablib/packages/openpyxl/reader/excel.py
@@ -29,32 +29,32 @@
 from zipfile import ZipFile, ZIP_DEFLATED, BadZipfile
 
 # package imports
-from openpyxl.shared.exc import OpenModeError, InvalidFileException
-from openpyxl.shared.ooxml import ARC_SHARED_STRINGS, ARC_CORE, ARC_APP, \
+from ..shared.exc import OpenModeError, InvalidFileException
+from ..shared.ooxml import ARC_SHARED_STRINGS, ARC_CORE, ARC_APP, \
         ARC_WORKBOOK, PACKAGE_WORKSHEETS, ARC_STYLE
-from openpyxl.workbook import Workbook
-from openpyxl.reader.strings import read_string_table
-from openpyxl.reader.style import read_style_table
-from openpyxl.reader.workbook import read_sheets_titles, read_named_ranges, \
+from ..workbook import Workbook
+from ..reader.strings import read_string_table
+from ..reader.style import read_style_table
+from ..reader.workbook import read_sheets_titles, read_named_ranges, \
         read_properties_core, get_sheet_ids
-from openpyxl.reader.worksheet import read_worksheet
-from openpyxl.reader.iter_worksheet import unpack_worksheet
+from ..reader.worksheet import read_worksheet
+from ..reader.iter_worksheet import unpack_worksheet
 
 def load_workbook(filename, use_iterators = False):
     """Open the given filename and return the workbook
 
     :param filename: the path to open
     :type filename: string
-    
+
     :param use_iterators: use lazy load for cells
     :type use_iterators: bool
 
     :rtype: :class:`openpyxl.workbook.Workbook`
-    
+
     .. note::
-        
+
         When using lazy load, all worksheets will be :class:`openpyxl.reader.iter_worksheet.IterableWorksheet`
-        and the returned workbook will be read-only. 
+        and the returned workbook will be read-only.
 
     """
 
diff --git a/tablib/packages/openpyxl/reader/iter_worksheet.py b/tablib/packages/openpyxl/reader/iter_worksheet.py
index f8e9399..926116d 100644
--- a/tablib/packages/openpyxl/reader/iter_worksheet.py
+++ b/tablib/packages/openpyxl/reader/iter_worksheet.py
@@ -23,7 +23,7 @@
 # @license: http://www.opensource.org/licenses/mit-license.php

 # @author: Eric Gazoni

 

-""" Iterators-based worksheet reader 

+""" Iterators-based worksheet reader

 *Still very raw*

 """

 

@@ -32,18 +32,18 @@ import warnings
 import operator

 from functools import partial

 from itertools import ifilter, groupby

-from openpyxl.worksheet import Worksheet

-from openpyxl.cell import coordinate_from_string, get_column_letter, Cell

-from openpyxl.reader.excel import get_sheet_ids

-from openpyxl.reader.strings import read_string_table

-from openpyxl.reader.style import read_style_table, NumberFormat

-from openpyxl.shared.date_time import SharedDate

-from openpyxl.reader.worksheet import read_dimension

-from openpyxl.shared.ooxml import (MIN_COLUMN, MAX_COLUMN, PACKAGE_WORKSHEETS,

+from ..worksheet import Worksheet

+from ..cell import coordinate_from_string, get_column_letter, Cell

+from ..reader.excel import get_sheet_ids

+from ..reader.strings import read_string_table

+from ..reader.style import read_style_table, NumberFormat

+from ..shared.date_time import SharedDate

+from ..reader.worksheet import read_dimension

+from ..shared.ooxml import (MIN_COLUMN, MAX_COLUMN, PACKAGE_WORKSHEETS,

     MAX_ROW, MIN_ROW, ARC_SHARED_STRINGS, ARC_APP, ARC_STYLE)

 from xml.etree.cElementTree import iterparse

 from zipfile import ZipFile

-import openpyxl.cell

+from .. import cell

 import re

 import tempfile

 import zlib

@@ -51,7 +51,7 @@ import zipfile
 import struct

 

 TYPE_NULL = Cell.TYPE_NULL

-MISSING_VALUE = None 

+MISSING_VALUE = None

 

 RE_COORDINATE = re.compile('^([A-Z]+)([0-9]+)$')

 

@@ -108,11 +108,11 @@ class RawCell(BaseRawCell):
     def is_date(self):

         res = (self.data_type == Cell.TYPE_NUMERIC

                and self.number_format is not None

-               and ('d' in self.number_format 

+               and ('d' in self.number_format

                     or 'm' in self.number_format

                     or 'y' in self.number_format

                     or 'h' in self.number_format

-                    or 's' in self.number_format 

+                    or 's' in self.number_format

                    ))

 

         return res

@@ -121,7 +121,7 @@ def iter_rows(workbook_name, sheet_name, xml_source, range_string = '', row_offs
 

     archive = get_archive_file(workbook_name)

 

-    source = xml_source 

+    source = xml_source

 

     if range_string:

         min_col, min_row, max_col, max_row = get_range_boundaries(range_string, row_offset, column_offset)

@@ -187,7 +187,7 @@ def get_range_boundaries(range_string, row = 0, column = 0):
         min_col, min_row = coordinate_from_string(range_string)

         min_col = column_index_from_string(min_col)

         max_col = min_col + 1

-        max_row = min_row 

+        max_row = min_row

 

     return (min_col, min_row, max_col, max_row)

 

@@ -215,7 +215,7 @@ def get_squared_range(p, min_col, min_row, max_col, max_row, string_table, style
             for gap_row in xrange(current_row, row):

 

                 dummy_cells = get_missing_cells(gap_row, expected_columns)

-                

+

                 yield tuple([dummy_cells[column] for column in expected_columns])

 

                 current_row = row

@@ -254,11 +254,11 @@ def get_squared_range(p, min_col, min_row, max_col, max_row, string_table, style
 

         yield tuple(full_row)

 

-#------------------------------------------------------------------------------ 

+#------------------------------------------------------------------------------

 

 class IterableWorksheet(Worksheet):

 

-    def __init__(self, parent_workbook, title, workbook_name, 

+    def __init__(self, parent_workbook, title, workbook_name,

             sheet_codename, xml_source):

 

         Worksheet.__init__(self, parent_workbook, title)

@@ -267,20 +267,20 @@ class IterableWorksheet(Worksheet):
         self._xml_source = xml_source

 

     def iter_rows(self, range_string = '', row_offset = 0, column_offset = 0):

-        """ Returns a squared range based on the `range_string` parameter, 

+        """ Returns a squared range based on the `range_string` parameter,

         using generators.

-        

+

         :param range_string: range of cells (e.g. 'A1:C4')

         :type range_string: string

-        

+

         :param row: row index of the cell (e.g. 4)

         :type row: int

 

         :param column: column index of the cell (e.g. 3)

         :type column: int

-        

+

         :rtype: generator

-        

+

         """

 

         return iter_rows(workbook_name = self._workbook_name,

diff --git a/tablib/packages/openpyxl/reader/strings.py b/tablib/packages/openpyxl/reader/strings.py
index 525d502..e19e291 100644
--- a/tablib/packages/openpyxl/reader/strings.py
+++ b/tablib/packages/openpyxl/reader/strings.py
@@ -26,8 +26,8 @@
 """Read the shared strings table."""
 
 # package imports
-from openpyxl.shared.xmltools import fromstring, QName
-from openpyxl.shared.ooxml import NAMESPACES
+from ..shared.xmltools import fromstring, QName
+from ..shared.ooxml import NAMESPACES
 
 
 def read_string_table(xml_source):
diff --git a/tablib/packages/openpyxl/reader/style.py b/tablib/packages/openpyxl/reader/style.py
index 1286f9a..f773070 100644
--- a/tablib/packages/openpyxl/reader/style.py
+++ b/tablib/packages/openpyxl/reader/style.py
@@ -26,9 +26,9 @@
 """Read shared style definitions"""
 
 # package imports
-from openpyxl.shared.xmltools import fromstring, QName
-from openpyxl.shared.exc import MissingNumberFormat
-from openpyxl.style import Style, NumberFormat
+from ..shared.xmltools import fromstring, QName
+from ..shared.exc import MissingNumberFormat
+from ..style import Style, NumberFormat
 
 
 def read_style_table(xml_source):
diff --git a/tablib/packages/openpyxl/reader/workbook.py b/tablib/packages/openpyxl/reader/workbook.py
index 3419a31..d9bc161 100644
--- a/tablib/packages/openpyxl/reader/workbook.py
+++ b/tablib/packages/openpyxl/reader/workbook.py
@@ -26,11 +26,11 @@
 """Read in global settings to be maintained by the workbook object."""
 
 # package imports
-from openpyxl.shared.xmltools import fromstring, QName
-from openpyxl.shared.ooxml import NAMESPACES
-from openpyxl.workbook import DocumentProperties
-from openpyxl.shared.date_time import W3CDTF_to_datetime
-from openpyxl.namedrange import NamedRange, split_named_range
+from ..shared.xmltools import fromstring, QName
+from ..shared.ooxml import NAMESPACES
+from ..workbook import DocumentProperties
+from ..shared.date_time import W3CDTF_to_datetime
+from ..namedrange import NamedRange, split_named_range
 
 import datetime
 
diff --git a/tablib/packages/openpyxl/reader/worksheet.py b/tablib/packages/openpyxl/reader/worksheet.py
index f7f3a73..722b6fd 100644
--- a/tablib/packages/openpyxl/reader/worksheet.py
+++ b/tablib/packages/openpyxl/reader/worksheet.py
@@ -34,12 +34,12 @@ from itertools import ifilter
 from StringIO import StringIO
 
 # package imports
-from openpyxl.cell import Cell, coordinate_from_string
-from openpyxl.worksheet import Worksheet
+from ..cell import Cell, coordinate_from_string
+from ..worksheet import Worksheet
 
 def _get_xml_iter(xml_source):
 
-    if not hasattr(xml_source, 'name'): 
+    if not hasattr(xml_source, 'name'):
         return StringIO(xml_source)
     else:
         xml_source.seek(0)
@@ -47,7 +47,7 @@ def _get_xml_iter(xml_source):
 
 def read_dimension(xml_source):
 
-    source = _get_xml_iter(xml_source) 
+    source = _get_xml_iter(xml_source)
 
     it = iterparse(source)
 
@@ -73,7 +73,7 @@ def filter_cells((event, element)):
 
 def fast_parse(ws, xml_source, string_table, style_table):
 
-    source = _get_xml_iter(xml_source) 
+    source = _get_xml_iter(xml_source)
 
     it = iterparse(source)
 
@@ -98,13 +98,13 @@ def fast_parse(ws, xml_source, string_table, style_table):
         # to avoid memory exhaustion, clear the item after use
         element.clear()
 
-from openpyxl.reader.iter_worksheet import IterableWorksheet
+from ..reader.iter_worksheet import IterableWorksheet
 
 def read_worksheet(xml_source, parent, preset_title, string_table,
                    style_table, workbook_name = None, sheet_codename = None):
     """Read an xml worksheet"""
     if workbook_name and sheet_codename:
-        ws = IterableWorksheet(parent, preset_title, workbook_name, 
+        ws = IterableWorksheet(parent, preset_title, workbook_name,
                 sheet_codename, xml_source)
     else:
         ws = Worksheet(parent, preset_title)