@@ -829,47 +829,46 @@ def _get_with(self, key):
829
829
elif isinstance (key , ABCDataFrame ):
830
830
raise TypeError ('Indexing a Series with DataFrame is not '
831
831
'supported, use the appropriate DataFrame column' )
832
- else :
833
- if isinstance (key , tuple ):
834
- try :
835
- return self ._get_values_tuple (key )
836
- except Exception :
837
- if len (key ) == 1 :
838
- key = key [0 ]
839
- if isinstance (key , slice ):
840
- return self ._get_values (key )
841
- raise
832
+ elif isinstance (key , tuple ):
833
+ try :
834
+ return self ._get_values_tuple (key )
835
+ except Exception :
836
+ if len (key ) == 1 :
837
+ key = key [0 ]
838
+ if isinstance (key , slice ):
839
+ return self ._get_values (key )
840
+ raise
842
841
843
- # pragma: no cover
844
- if not isinstance (key , (list , np .ndarray , Series , Index )):
845
- key = list (key )
842
+ # pragma: no cover
843
+ if not isinstance (key , (list , np .ndarray , Series , Index )):
844
+ key = list (key )
846
845
847
- if isinstance (key , Index ):
848
- key_type = key .inferred_type
849
- else :
850
- key_type = lib .infer_dtype (key )
846
+ if isinstance (key , Index ):
847
+ key_type = key .inferred_type
848
+ else :
849
+ key_type = lib .infer_dtype (key )
851
850
852
- if key_type == 'integer' :
853
- if self .index .is_integer () or self .index .is_floating ():
854
- return self .loc [key ]
855
- else :
856
- return self ._get_values (key )
857
- elif key_type == 'boolean' :
858
- return self ._get_values (key )
851
+ if key_type == 'integer' :
852
+ if self .index .is_integer () or self .index .is_floating ():
853
+ return self .loc [key ]
859
854
else :
860
- try :
861
- # handle the dup indexing case (GH 4246)
862
- if isinstance (key , (list , tuple )):
863
- return self .loc [key ]
855
+ return self ._get_values (key )
856
+ elif key_type == 'boolean' :
857
+ return self ._get_values (key )
864
858
865
- return self .reindex (key )
866
- except Exception :
867
- # [slice(0, 5, None)] will break if you convert to ndarray,
868
- # e.g. as requested by np.median
869
- # hack
870
- if isinstance (key [0 ], slice ):
871
- return self ._get_values (key )
872
- raise
859
+ try :
860
+ # handle the dup indexing case (GH 4246)
861
+ if isinstance (key , (list , tuple )):
862
+ return self .loc [key ]
863
+
864
+ return self .reindex (key )
865
+ except Exception :
866
+ # [slice(0, 5, None)] will break if you convert to ndarray,
867
+ # e.g. as requested by np.median
868
+ # hack
869
+ if isinstance (key [0 ], slice ):
870
+ return self ._get_values (key )
871
+ raise
873
872
874
873
def _get_values_tuple (self , key ):
875
874
# mpl hackaround
0 commit comments