Skip to content

Commit 3044664

Browse files
committed
REF: remove Picklable class
1 parent 05bd9d6 commit 3044664

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

RELEASE.rst

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ pandas 0.8.0
5858
booleans and NAs (GH #1074)
5959
- Couldn't assign whole array to column in mixed-type DataFrame via .ix
6060
(#1142)
61+
- Fix label slicing issues with float index values (#1167)
6162

6263
pandas 0.7.3
6364
============

pandas/core/generic.py

+9-13
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,11 @@
88
from pandas.tseries.index import DatetimeIndex
99
from pandas.tseries.offsets import DateOffset
1010

11-
#-------------------------------------------------------------------------------
12-
# Picklable mixin
13-
14-
class Picklable(object):
15-
16-
def save(self, path):
17-
save(self, path)
18-
19-
@classmethod
20-
def load(cls, path):
21-
return load(path)
22-
2311
class PandasError(Exception):
2412
pass
2513

26-
class PandasObject(Picklable):
14+
15+
class PandasObject(object):
2716

2817
_AXIS_NUMBERS = {
2918
'index' : 0,
@@ -33,6 +22,13 @@ class PandasObject(Picklable):
3322
_AXIS_ALIASES = {}
3423
_AXIS_NAMES = dict((v, k) for k, v in _AXIS_NUMBERS.iteritems())
3524

25+
def save(self, path):
26+
save(self, path)
27+
28+
@classmethod
29+
def load(cls, path):
30+
return load(path)
31+
3632
#----------------------------------------------------------------------
3733
# Axis name business
3834

pandas/core/series.py

-3
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,6 @@ class Series(np.ndarray, generic.PandasObject):
267267

268268
_AXIS_NAMES = dict((v, k) for k, v in _AXIS_NUMBERS.iteritems())
269269

270-
__slots__ = ['_index', 'name']
271-
272270
def __new__(cls, data=None, index=None, dtype=None, name=None,
273271
copy=False):
274272
if data is None:
@@ -431,7 +429,6 @@ def _get_with(self, key):
431429
from pandas.core.indexing import _is_index_slice
432430

433431
idx_type = self.index.inferred_type
434-
435432
if idx_type == 'floating':
436433
indexer = self.ix._convert_to_indexer(key, axis=0)
437434
elif idx_type == 'integer' or _is_index_slice(key):

0 commit comments

Comments
 (0)