Skip to content

Commit 2f3648b

Browse files
committed
Changed unnamed parameter to named
1 parent 153ae0d commit 2f3648b

File tree

2 files changed

+36
-23
lines changed

2 files changed

+36
-23
lines changed

pandas/io/pytables.py

Lines changed: 31 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,7 @@ def get_storer(self, key):
11651165
""" return the storer object for a key, raise if not in the file """
11661166
group = self.get_node(key)
11671167
if group is None:
1168-
raise KeyError('No object named {} in the file'.format(key))
1168+
raise KeyError('No object named {key} in the file'.format(key=key))
11691169

11701170
s = self._create_storer(group)
11711171
s.infer_axes()
@@ -1596,9 +1596,9 @@ def __unicode__(self):
15961596
self.axis,
15971597
self.pos,
15981598
self.kind)))
1599-
return ','.join(
1600-
("{}->{}".format(key, value) for key, value in zip(
1601-
['name', 'cname', 'axis', 'pos', 'kind'], temp)))
1599+
return ','.join(("{key}->{value}".format(key=key, value=value)
1600+
for key, value in zip(
1601+
['name', 'cname', 'axis', 'pos', 'kind'], temp)))
16021602

16031603
def __eq__(self, other):
16041604
""" compare 2 col items """
@@ -1722,11 +1722,12 @@ def validate_col(self, itemsize=None):
17221722
itemsize = self.itemsize
17231723
if c.itemsize < itemsize:
17241724
raise ValueError(
1725-
"Trying to store a string with len [{}] in [{}] "
1726-
"column but\nthis column has a limit of [{}]!\n"
1727-
"Consider using min_itemsize to preset the sizes on "
1728-
"these columns".format(
1729-
itemsize, self.cname, c.itemsize))
1725+
"Trying to store a string with len [{itemsize}] in "
1726+
"[{cname}] column but\nthis column has a limit of "
1727+
"[{c_itemsize}]!\nConsider using min_itemsize to "
1728+
"preset the sizes on these columns".format(
1729+
itemsize=itemsize, cname=self.cname,
1730+
c_itemsize=c.itemsize))
17301731
return c.itemsize
17311732

17321733
return None
@@ -1736,8 +1737,10 @@ def validate_attr(self, append):
17361737
if append:
17371738
existing_kind = getattr(self.attrs, self.kind_attr, None)
17381739
if existing_kind is not None and existing_kind != self.kind:
1739-
raise TypeError("incompatible kind in col [{} - {}]".format(
1740-
existing_kind, self.kind))
1740+
raise TypeError(
1741+
"incompatible kind in col [{existing} - "
1742+
"{self_kind}]".format(
1743+
existing=existing_kind, self_kind=self.kind))
17411744

17421745
def update_info(self, info):
17431746
""" set/update the info for this indexable with the key/value
@@ -1762,9 +1765,11 @@ def update_info(self, info):
17621765

17631766
else:
17641767
raise ValueError(
1765-
"invalid info for [{}] for [{}], existing_value [{}] "
1766-
"conflicts with new value [{}]".format(
1767-
self.name, key, existing_value, value))
1768+
"invalid info for [{name}] for [{key}], "
1769+
"existing_value [{existing_value}] conflicts with "
1770+
"new value [{value}]".format(
1771+
name=self.name, key=key,
1772+
existing_value=existing_value, value=value))
17681773
else:
17691774
if value is not None or existing_value is not None:
17701775
idx[key] = value
@@ -1871,9 +1876,9 @@ def __init__(self, values=None, kind=None, typ=None,
18711876
super(DataCol, self).__init__(values=values, kind=kind, typ=typ,
18721877
cname=cname, **kwargs)
18731878
self.dtype = None
1874-
self.dtype_attr = u'{}_dtype'.format(self.name)
1879+
self.dtype_attr = u'{name}_dtype'.format(name=self.name)
18751880
self.meta = meta
1876-
self.meta_attr = u'{}_meta'.format(self.name)
1881+
self.meta_attr = u'{name}_meta'.format(name=self.name)
18771882
self.set_data(data)
18781883
self.set_metadata(metadata)
18791884

@@ -1885,8 +1890,9 @@ def __unicode__(self):
18851890
self.dtype,
18861891
self.kind,
18871892
self.shape)))
1888-
return ("name->{},cname->{},dtype->{},kind->{},"
1889-
"shape->{}".format(*temp))
1893+
return ','.join(("{key}->{value}".format(key=key, value=value)
1894+
for key, value in zip(
1895+
['name', 'cname', 'dtype', 'kind', 'shape'], temp)))
18901896

18911897
def __eq__(self, other):
18921898
""" compare 2 col items """
@@ -3092,9 +3098,13 @@ def __unicode__(self):
30923098
version='.'.join(str(x) for x in self.version))
30933099

30943100
return (
3095-
"{:12.12}{} (typ->{},nrows->{},ncols->{},indexers->[{}]{})".format(
3096-
self.pandas_type, ver, self.table_type_short, self.nrows,
3097-
self.ncols, ','.join(a.name for a in self.index_axes), dc))
3101+
"{pandas_type:12.12}{ver} (typ->{table_type},nrows->{nrows},"
3102+
"ncols->{ncols},indexers->[{index_axes}]{dc})".format(
3103+
pandas_type=self.pandas_type, ver=ver,
3104+
table_type=self.table_type_short, nrows=self.nrows,
3105+
ncols=self.ncols,
3106+
index_axes=(','.join(a.name for a in self.index_axes)), dc=dc
3107+
))
30983108

30993109
def __getitem__(self, c):
31003110
""" return the axis for c """

pandas/io/sas/sas7bdat.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,11 @@ def _process_columnsize_subheader(self, offset, length):
435435
self.column_count = self._read_int(offset, int_len)
436436
if (self.col_count_p1 + self.col_count_p2 !=
437437
self.column_count):
438-
print("Warning: column count mismatch ({} + {} != {})\n".format(
439-
self.col_count_p1, self.col_count_p2, self.column_count))
438+
print(
439+
"Warning: column count mismatch ({p1} + {p2} != "
440+
"{column_count})\n".format(
441+
p1=self.col_count_p1, p2=self.col_count_p2,
442+
column_count=self.column_count))
440443

441444
# Unknown purpose
442445
def _process_subheader_counts(self, offset, length):

0 commit comments

Comments
 (0)