Skip to content

Commit d85db2a

Browse files
committed
ENH: fixup tilde expansion, xref pandas-dev#11438
1 parent ea758cd commit d85db2a

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

pandas/core/format.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
OrderedDict)
1414
from pandas.util.terminal import get_terminal_size
1515
from pandas.core.config import get_option, set_option
16-
from pandas.io.common import _get_handle, UnicodeWriter
16+
from pandas.io.common import _get_handle, UnicodeWriter, _expand_user
1717
import pandas.core.common as com
1818
import pandas.lib as lib
1919
from pandas.tslib import iNaT, Timestamp, Timedelta, format_array_from_datetime
@@ -343,7 +343,7 @@ def __init__(self, frame, buf=None, columns=None, col_space=None,
343343
index_names=True, line_width=None, max_rows=None,
344344
max_cols=None, show_dimensions=False, **kwds):
345345
self.frame = frame
346-
self.buf = buf if buf is not None else StringIO()
346+
self.buf = _expand_user(buf) if buf is not None else StringIO()
347347
self.show_index_names = index_names
348348

349349
if sparsify is None:
@@ -1276,7 +1276,7 @@ def __init__(self, obj, path_or_buf=None, sep=",", na_rep='', float_format=None,
12761276
if path_or_buf is None:
12771277
path_or_buf = StringIO()
12781278

1279-
self.path_or_buf = path_or_buf
1279+
self.path_or_buf = _expand_user(path_or_buf)
12801280
self.sep = sep
12811281
self.na_rep = na_rep
12821282
self.float_format = float_format

pandas/core/frame.py

-4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
from pandas.tseries.period import PeriodIndex
5454
from pandas.tseries.index import DatetimeIndex
5555
from pandas.tseries.tdi import TimedeltaIndex
56-
from pandas.io.common import _expand_user
5756

5857
import pandas.core.algorithms as algos
5958
import pandas.core.base as base
@@ -1315,7 +1314,6 @@ def to_csv(self, path_or_buf=None, sep=",", na_rep='', float_format=None,
13151314
.. versionadded:: 0.16.0
13161315
13171316
"""
1318-
path_or_buf = _expand_user(path_or_buf)
13191317
formatter = fmt.CSVFormatter(self, path_or_buf,
13201318
line_terminator=line_terminator,
13211319
sep=sep, encoding=encoding,
@@ -1518,7 +1516,6 @@ def to_html(self, buf=None, columns=None, col_space=None, colSpace=None,
15181516
FutureWarning, stacklevel=2)
15191517
col_space = colSpace
15201518

1521-
buf = _expand_user(buf)
15221519
formatter = fmt.DataFrameFormatter(self, buf=buf, columns=columns,
15231520
col_space=col_space, na_rep=na_rep,
15241521
formatters=formatters,
@@ -1569,7 +1566,6 @@ def to_latex(self, buf=None, columns=None, col_space=None, colSpace=None,
15691566
FutureWarning, stacklevel=2)
15701567
col_space = colSpace
15711568

1572-
buf = _expand_user(buf)
15731569
formatter = fmt.DataFrameFormatter(self, buf=buf, columns=columns,
15741570
col_space=col_space, na_rep=na_rep,
15751571
header=header, index=index,

0 commit comments

Comments
 (0)