@@ -1316,7 +1316,7 @@ def test_nested_exception(self):
13161316 df .index = l
13171317
13181318 try :
1319- print df
1319+ repr ( df )
13201320 except Exception ,e :
13211321 self .assertNotEqual (type (e ),UnboundLocalError )
13221322
@@ -3074,15 +3074,25 @@ def test_first_last_valid(self):
30743074 self .assert_ (index == frame .index [- 6 ])
30753075
30763076 def test_arith_flex_frame (self ):
3077- res_add = self .frame .add (self .frame )
3078- res_sub = self .frame .sub (self .frame )
3079- res_mul = self .frame .mul (self .frame )
3080- res_div = self .frame .div (2 * self .frame )
3081-
3082- assert_frame_equal (res_add , self .frame + self .frame )
3083- assert_frame_equal (res_sub , self .frame - self .frame )
3084- assert_frame_equal (res_mul , self .frame * self .frame )
3085- assert_frame_equal (res_div , self .frame / (2 * self .frame ))
3077+ ops = ['add' , 'sub' , 'mul' , 'div' , 'pow' ]
3078+ aliases = {'div' : 'truediv' }
3079+
3080+ for op in ops :
3081+ alias = aliases .get (op , op )
3082+ f = getattr (operator , alias )
3083+ result = getattr (self .frame , op )(2 * self .frame )
3084+ exp = f (self .frame , 2 * self .frame )
3085+ assert_frame_equal (result , exp )
3086+
3087+ # res_add = self.frame.add(self.frame)
3088+ # res_sub = self.frame.sub(self.frame)
3089+ # res_mul = self.frame.mul(self.frame)
3090+ # res_div = self.frame.div(2 * self.frame)
3091+
3092+ # assert_frame_equal(res_add, self.frame + self.frame)
3093+ # assert_frame_equal(res_sub, self.frame - self.frame)
3094+ # assert_frame_equal(res_mul, self.frame * self.frame)
3095+ # assert_frame_equal(res_div, self.frame / (2 * self.frame))
30863096
30873097 const_add = self .frame .add (1 )
30883098 assert_frame_equal (const_add , self .frame + 1 )
0 commit comments