Commits

Charlie Clark committed c047264 Merge

Merge corrected imports.

Comments (0)

Files changed (8)

openpyxl/formatting/__init__.py

 
 from openpyxl.compat import iteritems, OrderedDict
 
+from openpyxl.styles import Font, Fill, Borders
 from .rules import CellIsRule, ColorScaleRule, FormatRule
 
 

openpyxl/formatting/rules.py

 
 from collections import Mapping
 
+from openpyxl.compat import iteritems
 from openpyxl.styles import Font, Fill, Borders
 
 

openpyxl/reader/worksheet.py

 from openpyxl.xml.constants import SHEET_MAIN_NS
 from openpyxl.xml.functions import safe_iterator
 from openpyxl.styles import Color
-from openpyxl.styles.formatting import ConditionalFormatting
+from openpyxl.formatting import ConditionalFormatting
+from openpyxl.formatting.rules import FormatRule, CellIsRule, ColorScaleRule, FormatRule
 
 
 def _get_xml_iter(xml_source):

openpyxl/tests/conftest.py

 
 # Styles
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def FormatRule():
     """Formatting rule class"""
-    from openpyxl.styles.formatting import FormatRule
+    from openpyxl.formatting.rules import FormatRule
     return FormatRule
 
 

openpyxl/tests/test_conditional_formatting.py

 # compatibility imports
 from openpyxl import Workbook
 from openpyxl.compat import StringIO
-from openpyxl.styles.formatting import ConditionalFormatting, ColorScaleRule, CellIsRule, FormulaRule
+from openpyxl.formatting import ConditionalFormatting
+from openpyxl.formatting.rules import ColorScaleRule, CellIsRule, FormulaRule
 from openpyxl.compat import iterkeys
 
 # package imports

openpyxl/tests/test_style.py

 from openpyxl.writer.excel import save_virtual_workbook
 from openpyxl.writer.styles import StyleWriter
 from openpyxl.styles import NumberFormat, Border, Color, Font, Fill, Borders
-from openpyxl.styles.formatting import ConditionalFormatting, FormulaRule
+from openpyxl.formatting import ConditionalFormatting
+from openpyxl.formatting.rules import FormulaRule
 from openpyxl.xml.functions import Element, SubElement, tostring
 from openpyxl.xml.constants import SHEET_MAIN_NS
 

openpyxl/worksheet/worksheet.py

     DEFAULT_ROW_HEIGHT
     )
 from openpyxl.styles import Style, DEFAULTS as DEFAULTS_STYLE
-from openpyxl.styles.formatting import ConditionalFormatting
+from openpyxl.formatting import ConditionalFormatting
 from openpyxl.namedrange import NamedRangeContainingValue
 from openpyxl.compat import OrderedDict, unicode, xrange, basestring
 from openpyxl.compat.itertools import iteritems

openpyxl/writer/worksheet.py

     VML_NS
 )
 from openpyxl.compat.itertools import iteritems, iterkeys
-from openpyxl.styles.formatting import ConditionalFormatting
+from openpyxl.formatting import ConditionalFormatting
 
 
 def row_sort(cell):