clean up imports

Author: jreback

pandas/core/frame.py

@@ -92,8 +92,8 @@
 import pandas.core.common as com
 import pandas.core.nanops as nanops
 import pandas.core.ops as ops
-import pandas.io.formats.format as fmt
 import pandas.io.formats.console as console
+import pandas.io.formats.format as fmt
 from pandas.io.formats.printing import pprint_thing
 import pandas.plotting._core as gfx
 
@@ -1567,18 +1567,19 @@ def to_csv(self, path_or_buf=None, sep=",", na_rep='', float_format=None,
         else:
             tupleize_cols = False
 
-        formatter = fmt.CSVFormatter(self, path_or_buf,
-                                     line_terminator=line_terminator, sep=sep,
-                                     encoding=encoding,
-                                     compression=compression, quoting=quoting,
-                                     na_rep=na_rep, float_format=float_format,
-                                     cols=columns, header=header, index=index,
-                                     index_label=index_label, mode=mode,
-                                     chunksize=chunksize, quotechar=quotechar,
-                                     tupleize_cols=tupleize_cols,
-                                     date_format=date_format,
-                                     doublequote=doublequote,
-                                     escapechar=escapechar, decimal=decimal)
+        from pandas.io.formats.csv import CSVFormatter
+        formatter = CSVFormatter(self, path_or_buf,
+                                 line_terminator=line_terminator, sep=sep,
+                                 encoding=encoding,
+                                 compression=compression, quoting=quoting,
+                                 na_rep=na_rep, float_format=float_format,
+                                 cols=columns, header=header, index=index,
+                                 index_label=index_label, mode=mode,
+                                 chunksize=chunksize, quotechar=quotechar,
+                                 tupleize_cols=tupleize_cols,
+                                 date_format=date_format,
+                                 doublequote=doublequote,
+                                 escapechar=escapechar, decimal=decimal)
         formatter.save()
 
         if path_or_buf is None:

pandas/io/formats/common.py

@@ -3,7 +3,6 @@
 Common helper methods used in different submodules of pandas.io.formats
 """
 
-from pandas.core.dtypes.common import is_integer
 from pandas import compat
 
 
@@ -61,25 +60,3 @@ def buffer_put_lines(buf, lines):
     if any(isinstance(x, compat.text_type) for x in lines):
         lines = [compat.text_type(x) for x in lines]
     buf.write('\n'.join(lines))
-
-
-class TableFormatter(object):
-
-    is_truncated = False
-    show_dimensions = None
-
-    @property
-    def should_show_dimensions(self):
-        return (self.show_dimensions is True or
-                (self.show_dimensions == 'truncate' and self.is_truncated))
-
-    def _get_formatter(self, i):
-        if isinstance(self.formatters, (list, tuple)):
-            if is_integer(i):
-                return self.formatters[i]
-            else:
-                return None
-        else:
-            if is_integer(i) and i not in self.columns:
-                i = self.columns[i]
-            return self.formatters.get(i, None)

pandas/io/formats/csv_format.py renamed to pandas/io/formats/csv.py

@@ -15,6 +15,7 @@
     is_integer_dtype,
     is_interval_dtype,
     is_datetimetz,
+    is_integer,
     is_float,
     is_scalar,
     is_numeric_dtype,
@@ -28,16 +29,11 @@
 from pandas import compat
 from pandas.compat import (StringIO, lzip, map, zip, u)
 
-from pandas.io.formats.html_format import HTMLFormatter
-from pandas.io.formats.latex_format import LatexFormatter
-from pandas.io.formats.csv_format import CSVFormatter
-
 from pandas.io.formats.terminal import get_terminal_size
 from pandas.core.config import get_option, set_option
 from pandas.io.common import (_expand_user, _stringify_path)
 from pandas.io.formats.printing import adjoin, justify, pprint_thing
 from pandas._libs import lib
-from pandas.io.formats.common import TableFormatter
 
 from pandas._libs.tslib import (iNaT, Timestamp, Timedelta,
                                 format_array_from_datetime)
@@ -352,6 +348,28 @@ def _get_adjustment():
         return TextAdjustment()
 
 
+class TableFormatter(object):
+
+    is_truncated = False
+    show_dimensions = None
+
+    @property
+    def should_show_dimensions(self):
+        return (self.show_dimensions is True or
+                (self.show_dimensions == 'truncate' and self.is_truncated))
+
+    def _get_formatter(self, i):
+        if isinstance(self.formatters, (list, tuple)):
+            if is_integer(i):
+                return self.formatters[i]
+            else:
+                return None
+        else:
+            if is_integer(i) and i not in self.columns:
+                i = self.columns[i]
+            return self.formatters.get(i, None)
+
+
 class DataFrameFormatter(TableFormatter):
     """
     Render a DataFrame
@@ -676,6 +694,7 @@ def to_latex(self, column_format=None, longtable=False, encoding=None,
         Render a DataFrame to a LaTeX tabular/longtable environment output.
         """
 
+        from pandas.io.formats.latex import LatexFormatter
         latex_renderer = LatexFormatter(self, column_format=column_format,
                                         longtable=longtable,
                                         multicolumn=multicolumn,
@@ -720,6 +739,7 @@ def to_html(self, classes=None, notebook=False, border=None):
 
             .. versionadded:: 0.19.0
          """
+        from pandas.io.formats.html import HTMLFormatter
         html_renderer = HTMLFormatter(self, classes=classes,
                                       max_rows=self.max_rows,
                                       max_cols=self.max_cols,

pandas/io/formats/format.py

@@ -15,8 +15,9 @@
                            OrderedDict, unichr)
 from pandas.core.config import get_option
 from pandas.io.formats.printing import pprint_thing
-from pandas.io.formats.common import (get_level_lengths,
-                                      TableFormatter, buffer_put_lines)
+from pandas.io.formats.common import (
+    get_level_lengths, buffer_put_lines)
+from pandas.io.formats.format import TableFormatter
 
 
 class HTMLFormatter(TableFormatter):

pandas/io/formats/html_format.py renamed to pandas/io/formats/html.py

@@ -7,8 +7,8 @@
 
 from pandas.core.index import MultiIndex
 from pandas import compat
-from pandas.compat import (range, map, zip, u)
-from pandas.io.formats.common import TableFormatter
+from pandas.compat import range, map, zip, u
+from pandas.io.formats.format import TableFormatter
 import numpy as np