@@ -1165,7 +1165,7 @@ def get_storer(self, key):
1165
1165
""" return the storer object for a key, raise if not in the file """
1166
1166
group = self .get_node (key )
1167
1167
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 ))
1169
1169
1170
1170
s = self ._create_storer (group )
1171
1171
s .infer_axes ()
@@ -1596,9 +1596,9 @@ def __unicode__(self):
1596
1596
self .axis ,
1597
1597
self .pos ,
1598
1598
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 )))
1602
1602
1603
1603
def __eq__ (self , other ):
1604
1604
""" compare 2 col items """
@@ -1722,11 +1722,12 @@ def validate_col(self, itemsize=None):
1722
1722
itemsize = self .itemsize
1723
1723
if c .itemsize < itemsize :
1724
1724
raise ValueError (
1725
- "Trying to store a string with len [{}] in [{}] "
1726
- "column but\n this 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\n this column has a limit of "
1727
+ "[{c_itemsize}]!\n Consider using min_itemsize to "
1728
+ "preset the sizes on these columns" .format (
1729
+ itemsize = itemsize , cname = self .cname ,
1730
+ c_itemsize = c .itemsize ))
1730
1731
return c .itemsize
1731
1732
1732
1733
return None
@@ -1736,8 +1737,10 @@ def validate_attr(self, append):
1736
1737
if append :
1737
1738
existing_kind = getattr (self .attrs , self .kind_attr , None )
1738
1739
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 ))
1741
1744
1742
1745
def update_info (self , info ):
1743
1746
""" set/update the info for this indexable with the key/value
@@ -1762,9 +1765,11 @@ def update_info(self, info):
1762
1765
1763
1766
else :
1764
1767
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 ))
1768
1773
else :
1769
1774
if value is not None or existing_value is not None :
1770
1775
idx [key ] = value
@@ -1871,9 +1876,9 @@ def __init__(self, values=None, kind=None, typ=None,
1871
1876
super (DataCol , self ).__init__ (values = values , kind = kind , typ = typ ,
1872
1877
cname = cname , ** kwargs )
1873
1878
self .dtype = None
1874
- self .dtype_attr = u'{}_dtype' .format (self .name )
1879
+ self .dtype_attr = u'{name }_dtype' .format (name = self .name )
1875
1880
self .meta = meta
1876
- self .meta_attr = u'{}_meta' .format (self .name )
1881
+ self .meta_attr = u'{name }_meta' .format (name = self .name )
1877
1882
self .set_data (data )
1878
1883
self .set_metadata (metadata )
1879
1884
@@ -1885,8 +1890,9 @@ def __unicode__(self):
1885
1890
self .dtype ,
1886
1891
self .kind ,
1887
1892
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 )))
1890
1896
1891
1897
def __eq__ (self , other ):
1892
1898
""" compare 2 col items """
@@ -3092,9 +3098,13 @@ def __unicode__(self):
3092
3098
version = '.' .join (str (x ) for x in self .version ))
3093
3099
3094
3100
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
+ ))
3098
3108
3099
3109
def __getitem__ (self , c ):
3100
3110
""" return the axis for c """
0 commit comments