weight tweaks

Author: Nick Eubank

doc/source/whatsnew/v0.16.1.txt

@@ -169,17 +169,13 @@ for passing in a column for weights for non-uniform sampling, and for setting se
 
 
 When applied to a DataFrame, one may pass the name of a column to specify sampling weights
-when sampling from rows (thought row names may not be passed to sample from rows). 
+when sampling from rows. 
 
 .. ipython :: python
 
-   df = DataFrame({'col1':[9,8,7,6], 'weight_column':[0.5, 0.4, 0.1, 0]}, index=['a', 'b', 'c', 'd'])
+   df = DataFrame({'col1':[9,8,7,6], 'weight_column':[0.5, 0.4, 0.1, 0]})
    df.sample(n=3, weights='weight_column')
 
-   df.sample(n=3, weights='weight_column', axis = )
-
-
-
 .. _whatsnew_0161.api:
 
 API changes

pandas/tests/test_generic.py

@@ -439,7 +439,7 @@ def test_sample(self):
         df = pd.DataFrame({'col1':range(10,20), 
                            'col2':range(20,30), 
                            'colString': ['a']*10,
-                           'easyweights':easy_weight_list}, index = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j'])    
+                           'easyweights':easy_weight_list})    
         sample1 = df.sample(n=1, weights='easyweights') 
         assert_frame_equal(sample1, df.iloc[5:6])