Merge branch 'master' into cat_fix

Author: dwillmer

asv_bench/benchmarks/sparse.py

@@ -1,3 +1,5 @@
+from itertools import repeat
+
 from .pandas_vb_common import *
 import scipy.sparse
 from pandas import SparseSeries, SparseDataFrame
@@ -27,6 +29,12 @@ class sparse_frame_constructor(object):
     def time_sparse_frame_constructor(self):
         SparseDataFrame(columns=np.arange(100), index=np.arange(1000))
 
+    def time_sparse_from_scipy(self):
+        SparseDataFrame(scipy.sparse.rand(1000, 1000, 0.005))
+
+    def time_sparse_from_dict(self):
+        SparseDataFrame(dict(zip(range(1000), repeat([0]))))
+
 
 class sparse_series_from_coo(object):
     goal_time = 0.2

asv_bench/vbench_to_asv.py

@@ -114,7 +114,7 @@ def translate_module(target_module):
     l_vars = {}
     exec('import ' + target_module) in g_vars
 
-    print target_module
+    print(target_module)
     module = eval(target_module, g_vars)
 
     benchmarks = []
@@ -157,7 +157,7 @@ def translate_module(target_module):
         mod = os.path.basename(module)
         if mod in ['make.py', 'measure_memory_consumption.py', 'perf_HEAD.py', 'run_suite.py', 'test_perf.py', 'generate_rst_files.py', 'test.py', 'suite.py']:
             continue
-        print
-        print mod
+        print('')
+        print(mod)
 
         translate_module(mod.replace('.py', ''))