Skip to content

Commit f6324c4

Browse files
committed
BLD: pep8 major changes
1 parent 0ba8a4f commit f6324c4

14 files changed

+896
-660
lines changed

pandas/core/common.py

+165-99
Large diffs are not rendered by default.

pandas/core/frame.py

+107-83
Large diffs are not rendered by default.

pandas/core/generic.py

+111-88
Large diffs are not rendered by default.

pandas/core/internals.py

+239-172
Large diffs are not rendered by default.

pandas/core/panel.py

+21-19
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ def f(self, other):
143143

144144

145145
class Panel(NDFrame):
146+
146147
"""
147148
Represents wide format panel data, stored as 3-dimensional array
148149
@@ -212,7 +213,7 @@ def _init_dict(self, data, axes, dtype=None):
212213
in data.iteritems() if k in haxis)
213214
else:
214215
ks = data.keys()
215-
if not isinstance(data,OrderedDict):
216+
if not isinstance(data, OrderedDict):
216217
ks = _try_sort(ks)
217218
haxis = Index(ks)
218219

@@ -270,7 +271,7 @@ def from_dict(cls, data, intersect=False, orient='items', dtype=None):
270271
-------
271272
Panel
272273
"""
273-
from pandas.util.compat import OrderedDict,OrderedDefaultdict
274+
from pandas.util.compat import OrderedDict, OrderedDefaultdict
274275

275276
orient = orient.lower()
276277
if orient == 'minor':
@@ -284,7 +285,7 @@ def from_dict(cls, data, intersect=False, orient='items', dtype=None):
284285

285286
d = cls._homogenize_dict(cls, data, intersect=intersect, dtype=dtype)
286287
ks = d['data'].keys()
287-
if not isinstance(d['data'],OrderedDict):
288+
if not isinstance(d['data'], OrderedDict):
288289
ks = list(sorted(ks))
289290
d[cls._info_axis_name] = Index(ks)
290291
return cls(**d)
@@ -348,7 +349,7 @@ def _init_matrix(self, data, axes, dtype=None, copy=False):
348349
ax = _ensure_index(ax)
349350
fixed_axes.append(ax)
350351

351-
return create_block_manager_from_blocks([ values ], fixed_axes)
352+
return create_block_manager_from_blocks([values], fixed_axes)
352353

353354
#----------------------------------------------------------------------
354355
# Comparison methods
@@ -534,7 +535,7 @@ def set_value(self, *args):
534535
axes = self._expand_axes(args)
535536
d = self._construct_axes_dict_from(self, axes, copy=False)
536537
result = self.reindex(**d)
537-
args = list(args)
538+
args = list(args)
538539
likely_dtype, args[-1] = _infer_dtype_from_scalar(args[-1])
539540
made_bigger = not np.array_equal(
540541
axes[0], self._info_axis)
@@ -838,7 +839,7 @@ def _ixs(self, i, axis=0):
838839

839840
# xs cannot handle a non-scalar key, so just reindex here
840841
if _is_list_like(key):
841-
return self.reindex(**{ self._get_axis_name(axis) : key })
842+
return self.reindex(**{self._get_axis_name(axis): key})
842843

843844
return self.xs(key, axis=axis)
844845

@@ -939,7 +940,7 @@ def _reduce(self, op, axis=0, skipna=True):
939940
result = result.T
940941

941942
return self._constructor_sliced(result,
942-
**self._extract_axes_for_slice(self, axes))
943+
**self._extract_axes_for_slice(self, axes))
943944

944945
def _wrap_result(self, result, axis):
945946
axis = self._get_axis_name(axis)
@@ -952,7 +953,7 @@ def _wrap_result(self, result, axis):
952953
return self._constructor(result, **self._construct_axes_dict())
953954
elif self.ndim == result.ndim + 1:
954955
return self._constructor_sliced(result,
955-
**self._extract_axes_for_slice(self, axes))
956+
**self._extract_axes_for_slice(self, axes))
956957

957958
raise PandasError("invalid _wrap_result [self->%s] [result->%s]" %
958959
(self.ndim, result.ndim))
@@ -1115,7 +1116,7 @@ def update(self, other, join='left', overwrite=True, filter_func=None,
11151116
if not isinstance(other, self._constructor):
11161117
other = self._constructor(other)
11171118

1118-
axis_name = self._info_axis_name
1119+
axis_name = self._info_axis_name
11191120
axis_values = self._info_axis
11201121
other = other.reindex(**{axis_name: axis_values})
11211122

@@ -1181,7 +1182,8 @@ def _homogenize_dict(self, frames, intersect=True, dtype=None):
11811182
from pandas.util.compat import OrderedDict
11821183

11831184
result = dict()
1184-
if isinstance(frames,OrderedDict): # caller differs dict/ODict, presered type
1185+
# caller differs dict/ODict, presered type
1186+
if isinstance(frames, OrderedDict):
11851187
result = OrderedDict()
11861188

11871189
adj_frames = OrderedDict()
@@ -1290,7 +1292,7 @@ def f(self, other, axis=0):
12901292
Parameters
12911293
----------
12921294
axis : {""" + ', '.join(cls._AXIS_ORDERS) + "} or {" \
1293-
+ ', '.join([str(i) for i in range(cls._AXIS_LEN)]) + """}
1295+
+ ', '.join([str(i) for i in range(cls._AXIS_LEN)]) + """}
12941296
skipna : boolean, default True
12951297
Exclude NA/null values. If an entire row/column is NA, the result
12961298
will be NA
@@ -1364,13 +1366,13 @@ def min(self, axis='major', skipna=True):
13641366
return self._reduce(nanops.nanmin, axis=axis, skipna=skipna)
13651367
cls.min = min
13661368

1367-
Panel._setup_axes(axes = ['items', 'major_axis', 'minor_axis'],
1368-
info_axis = 0,
1369-
stat_axis = 1,
1370-
aliases = { 'major': 'major_axis',
1371-
'minor': 'minor_axis' },
1372-
slicers = { 'major_axis': 'index',
1373-
'minor_axis': 'columns' })
1369+
Panel._setup_axes(axes=['items', 'major_axis', 'minor_axis'],
1370+
info_axis=0,
1371+
stat_axis=1,
1372+
aliases={'major': 'major_axis',
1373+
'minor': 'minor_axis'},
1374+
slicers={'major_axis': 'index',
1375+
'minor_axis': 'columns'})
13741376
Panel._add_aggregate_operations()
13751377

13761378
WidePanel = Panel
@@ -1386,7 +1388,7 @@ def install_ipython_completers(): # pragma: no cover
13861388
def complete_dataframe(obj, prev_completions):
13871389
return prev_completions + [c for c in obj.keys()
13881390
if isinstance(c, basestring)
1389-
and py3compat.isidentifier(c)]
1391+
and py3compat.isidentifier(c)]
13901392

13911393
# Importing IPython brings in about 200 modules, so we want to avoid it unless
13921394
# we're in IPython (when those modules are loaded anyway).

0 commit comments

Comments
 (0)