CLN: pandas.util.compat --> pandas.compat

Author: jtratner

bench/alignment.py

@@ -1,5 +1,5 @@
 # Setup
-from pandas.util.compat import range, lrange
+from pandas.compat import range, lrange
 import numpy as np
 import pandas
 import la

bench/bench_get_put_value.py

@@ -1,6 +1,6 @@
 from pandas import *
 from pandas.util.testing import rands
-from pandas.util.compat import range
+from pandas.compat import range
 
 N = 1000
 K = 50

bench/bench_groupby.py

@@ -1,6 +1,6 @@
 from pandas import *
 from pandas.util.testing import rands
-from pandas.util.compat import range
+from pandas.compat import range
 
 import string
 import random

bench/bench_khash_dict.py

@@ -8,7 +8,7 @@
 
 from vbench.api import Benchmark
 from pandas.util.testing import rands
-from pandas.util.compat import range
+from pandas.compat import range
 import pandas._tseries as lib
 import pandas._sandbox as sbx
 import time

bench/bench_merge.py

@@ -2,7 +2,7 @@
 import gc
 import time
 from pandas import *
-from pandas.util.compat import range, lrange, StringIO
+from pandas.compat import range, lrange, StringIO
 from pandas.util.testing import rands
 
 N = 10000

bench/bench_merge_sqlite.py

@@ -4,7 +4,7 @@
 import time
 from pandas import DataFrame
 from pandas.util.testing import rands
-from pandas.util.compat import range, zip
+from pandas.compat import range, zip
 import random
 
 N = 10000

bench/bench_sparse.py

@@ -3,7 +3,7 @@
 
 from pandas import *
 import pandas.core.sparse as spm
-import pandas.util.compat as compat
+import pandas.compat as compat
 reload(spm)
 from pandas.core.sparse import *
 

bench/bench_take_indexing.py

@@ -6,7 +6,7 @@
 
 from pandas import DataFrame
 import timeit
-from pandas.util.compat import zip
+from pandas.compat import zip
 
 setup = """
 from pandas import Series

bench/bench_unique.py

@@ -1,7 +1,7 @@
 from __future__ import print_function
 from pandas import *
 from pandas.util.testing import rands
-from pandas.util.compat import range, zip
+from pandas.compat import range, zip
 import pandas._tseries as lib
 import numpy as np
 import matplotlib.pyplot as plt

bench/better_unique.py

@@ -1,12 +1,12 @@
 from __future__ import print_function
 from pandas import DataFrame
-from pandas.util.compat import range, zip
+from pandas.compat import range, zip
 import timeit
 
 setup = """
 from pandas import Series
 import pandas._tseries as _tseries
-from pandas.util.compat import range
+from pandas.compat import range
 import random
 import numpy as np
 

bench/io_roundtrip.py

@@ -5,7 +5,7 @@
 
 import la
 import pandas
-from pandas.util.compat import range
+from pandas.compat import range
 from pandas import datetools, DateRange
 
 

bench/serialize.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-from pandas.util.compat import range, lrange
+from pandas.compat import range, lrange
 import time
 import os
 import numpy as np

bench/test.py

@@ -2,7 +2,7 @@
 import itertools
 import collections
 import scipy.ndimage as ndi
-from pandas.util.compat import zip, range
+from pandas.compat import zip, range
 
 N = 10000
 

doc/plots/stats/moment_plots.py

@@ -1,4 +1,4 @@
-from pandas.util.compat import range
+from pandas.compat import range
 import numpy as np
 
 import matplotlib.pyplot as plt

doc/source/conf.py

@@ -12,7 +12,7 @@
 
 import sys
 import os
-from pandas.util.compat import u
+from pandas.compat import u
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

doc/source/release.rst

@@ -52,8 +52,9 @@ pandas 0.13
     also led to the introduction of substantive parts of the Benjamin
     Peterson's ``six`` library into compat. (:issue:`4384`, :issue:`4375`,
     :issue:`4372`)
-  - ``pandas.util.py3compat`` has been merged into ``pandas.util.compat`` and
-    removed from pandas. It contains both list and iterator versions of range,
+  - ``pandas.util.compat`` and ``pandas.util.py3compat`` have been merged into
+    ``pandas.compat``. ``pandas.compat`` now includes many functions allowing
+    2/3 compatibility. It contains both list and iterator versions of range,
     filter, map and zip, plus other necessary elements for Python 3
     compatibility. ``lmap``, ``lzip``, ``lrange`` and ``lfilter`` all produce
     lists instead of iterators, for compatibility with ``numpy``, subscripting

doc/source/v0.13.0.txt

@@ -19,8 +19,9 @@ API changes
     also led to the introduction of substantive parts of the Benjamin
     Peterson's ``six`` library into compat. (:issue:`4384`, :issue:`4375`,
     :issue:`4372`)
-  - ``pandas.util.py3compat`` has been merged into ``pandas.util.compat`` and
-    removed from pandas. It contains both list and iterator versions of range,
+  - ``pandas.util.compat`` and ``pandas.util.py3compat`` have been merged into
+    ``pandas.compat``. ``pandas.compat`` now includes many functions allowing
+    2/3 compatibility. It contains both list and iterator versions of range,
     filter, map and zip, plus other necessary elements for Python 3
     compatibility. ``lmap``, ``lzip``, ``lrange`` and ``lfilter`` all produce
     lists instead of iterators, for compatibility with ``numpy``, subscripting

doc/sphinxext/comment_eater.py

@@ -1,4 +1,4 @@
-from pandas.util.compat import cStringIO
+from pandas.compat import cStringIO
 import compiler
 import inspect
 import textwrap

doc/sphinxext/compiler_unparse.py

@@ -12,7 +12,7 @@
 """
 
 import sys
-from pandas.util.compat import cStringIO as StringIO
+from pandas.compat import cStringIO as StringIO
 from compiler.ast import Const, Name, Tuple, Div, Mul, Sub, Add
 
 def unparse(ast, single_line_functions=False):

doc/sphinxext/docscrape.py

@@ -8,7 +8,7 @@
 import re
 import pydoc
 from warnings import warn
-from pandas.util.compat import StringIO, callable
+from pandas.compat import StringIO, callable
 
 class Reader(object):
     """A line-based string reader.

doc/sphinxext/docscrape_sphinx.py

@@ -1,7 +1,7 @@
 import re, inspect, textwrap, pydoc
 import sphinx
 from .docscrape import NumpyDocString, FunctionDoc, ClassDoc
-from pandas.util.compat import callable
+from pandas.compat import callable
 
 class SphinxDocString(NumpyDocString):
     def __init__(self, docstring, config={}):

doc/sphinxext/ipython_directive.py

@@ -58,7 +58,7 @@
 #-----------------------------------------------------------------------------
 
 # Stdlib
-from pandas.util.compat import zip, range, map, lmap, u, cStringIO as StringIO
+from pandas.compat import zip, range, map, lmap, u, cStringIO as StringIO
 import ast
 import os
 import re

doc/sphinxext/numpydoc.py

@@ -23,7 +23,7 @@
 
 import os, re, pydoc
 from .docscrape_sphinx import get_doc_object, SphinxDocString
-from pandas.util.compat import u, callable
+from pandas.compat import u, callable
 from sphinx.util.compat import Directive
 import inspect
 

doc/sphinxext/plot_directive.py

@@ -75,7 +75,7 @@
 
 """
 
-from pandas.util.compat import range, cStringIO as StringIO, map
+from pandas.compat import range, cStringIO as StringIO, map
 import sys, os, glob, shutil, imp, warnings, re, textwrap, traceback
 import sphinx
 

doc/sphinxext/tests/test_docscrape.py

@@ -7,7 +7,7 @@
 from docscrape import NumpyDocString, FunctionDoc, ClassDoc
 from docscrape_sphinx import SphinxDocString, SphinxClassDoc
 from nose.tools import *
-from pandas.util.compat import u
+from pandas.compat import u
 
 doc_txt = '''\
   numpy.multivariate_normal(mean, cov, shape=None)

doc/sphinxext/traitsdoc.py

@@ -18,7 +18,7 @@
 import os
 import pydoc
 
-from pandas.util.compat import callable
+from pandas.compat import callable
 from . import docscrape
 from . import docscrape_sphinx
 from .docscrape_sphinx import SphinxClassDoc, SphinxFunctionDoc, SphinxDocString

examples/finance.py

@@ -3,7 +3,7 @@
 """
 
 from datetime import datetime
-from pandas.util.compat import zip
+from pandas.compat import zip
 
 import matplotlib.finance as fin
 import numpy as np