Python 2 support

.travis.yml

@@ -1,5 +1,6 @@
 language: python
 python:
+  - "2.7"
   - "3.3"
   - "3.4"
   - "3.5"

examples/speed_test.ipynb

@@ -156,7 +156,7 @@
     }
    ],
    "source": [
-    "results.print()"
+    "results.show()"
    ]
   },
   {
@@ -248,7 +248,7 @@
     }
    ],
    "source": [
-    "results.print()"
+    "results.show()"
    ]
   },
   {

examples/usage.ipynb

@@ -146,7 +146,7 @@
     }
    ],
    "source": [
-    "df.print()"
+    "df.show()"
    ]
   },
   {
@@ -273,7 +273,7 @@
    "source": [
     "#indexes can be any non-repeating unique values\n",
     "df.index = ['apple', 'pear', 7.7]\n",
-    "df.print()"
+    "df.show()"
    ]
   },
   {
@@ -417,7 +417,7 @@
    "source": [
     "# set a single cell\n",
     "df.set(10, 'a', 100)\n",
-    "df.print()"
+    "df.show()"
    ]
   },
   {
@@ -443,7 +443,7 @@
    "source": [
     "# set a value outside current range creates a new row and/or column. Can also use [] for setting\n",
     "df[13, 'c'] = 9\n",
-    "df.print()"
+    "df.show()"
    ]
   },
   {
@@ -469,7 +469,7 @@
    "source": [
     "# set column\n",
     "df['b'] = 55\n",
-    "df.print()"
+    "df.show()"
    ]
   },
   {
@@ -656,7 +656,7 @@
    ],
    "source": [
     "# get an entire column\n",
-    "df['c'].print()"
+    "df['c'].show()"
    ]
   },
   {
@@ -682,7 +682,7 @@
    ],
    "source": [
     "# get list of columns\n",
-    "df[['a', 'c']].print()"
+    "df[['a', 'c']].show()"
    ]
   },
   {
@@ -706,7 +706,7 @@
    ],
    "source": [
     "# get subset of the index\n",
-    "df[[11, 12, 13], 'b'].print()"
+    "df[[11, 12, 13], 'b'].show()"
    ]
   },
   {
@@ -730,7 +730,7 @@
    ],
    "source": [
     "# get using slices\n",
-    "df[11:13, 'b'].print()"
+    "df[11:13, 'b'].show()"
    ]
   },
   {
@@ -753,7 +753,7 @@
    ],
    "source": [
     "# get a matrix\n",
-    "df[10:11, ['a', 'c']].print()"
+    "df[10:11, ['a', 'c']].show()"
    ]
   },
   {
@@ -830,7 +830,7 @@
     }
    ],
    "source": [
-    "df.get_locations(locations=[0, 2]).print()"
+    "df.get_locations(locations=[0, 2]).show()"
    ]
   },
   {
@@ -856,7 +856,7 @@
    ],
    "source": [
     "df.set_locations(locations=[0, 2], column='a', values=-9)\n",
-    "df.print()"
+    "df.show()"
    ]
   },
   {
@@ -886,7 +886,7 @@
     }
    ],
    "source": [
-    "df.head(2).print()"
+    "df.head(2).show()"
    ]
   },
   {
@@ -908,7 +908,7 @@
     }
    ],
    "source": [
-    "df.tail(2).print()"
+    "df.tail(2).show()"
    ]
   },
   {
@@ -1232,7 +1232,7 @@
    ],
    "source": [
     "df1 = rc.DataFrame({'a': [1, 2], 'b': [5, 6]}, index=[1, 2])\n",
-    "df1.print()"
+    "df1.show()"
    ]
   },
   {
@@ -1920,7 +1920,7 @@
     }
    ],
    "source": [
-    "df.print()"
+    "df.show()"
    ]
   },
   {

raccoon/dataframe.py

@@ -1,13 +1,16 @@
 """
 DataFrame class
 """
-
+from __future__ import print_function
+import sys
 from itertools import compress
 from collections import OrderedDict, namedtuple
 from bisect import bisect_left, bisect_right
 from tabulate import tabulate
 from blist import blist
 
+PYTHON3 = (sys.version_info >= (3, 0))
+
 try:
     import simplejson as json
 except ImportError:
@@ -133,7 +136,7 @@ def _make_table(self, index=True, **kwargs):
         kwargs['headers'] = 'keys' if 'headers' not in kwargs.keys() else kwargs['headers']
         return tabulate(self.to_dict(ordered=True, index=index), **kwargs)
 
-    def print(self, index=True, **kwargs):
+    def show(self, index=True, **kwargs):
         """
         Print the contents of the DataFrame. This method uses the tabulate function from the tabulate package. Use the
         kwargs to pass along any arguments to the tabulate function.
@@ -176,11 +179,17 @@ def __len__(self):
 
     @property
     def data(self):
-        return self._data.copy()
+        if PYTHON3:
+            return self._data.copy()
+        else:
+            return self._data[:]
 
     @property
     def columns(self):
-        return self._columns.copy()
+        if PYTHON3:
+            return self._columns.copy()
+        else:
+            return self._columns[:]
 
     @columns.setter
     def columns(self, columns_list):
@@ -189,7 +198,10 @@ def columns(self, columns_list):
 
     @property
     def index(self):
-        return self._index.copy()
+        if PYTHON3:
+            return self._index.copy()
+        else:
+            return self._index[:]
 
     @index.setter
     def index(self, index_list):
@@ -726,7 +738,7 @@ def to_dict(self, index=True, ordered=False):
         result.update(data_dict)
         return result
 
-    def to_json(self) -> str:
+    def to_json(self):
         """
         Returns a JSON of the entire DataFrame that can be reconstructed back with raccoon.from_json(input). Any object
         that cannot be serialized will be replaced with the representation of the object using repr(). In that instance
@@ -903,7 +915,10 @@ def append(self, data_frame):
             raise ValueError('duplicate indexes in DataFrames')
 
         for c, column in enumerate(data_frame.columns):
-            self.set(indexes=data_frame.index, columns=column, values=data_frame.data[c].copy())
+            if PYTHON3:
+                self.set(indexes=data_frame.index, columns=column, values=data_frame.data[c].copy())
+            else:
+                self.set(indexes=data_frame.index, columns=column, values=data_frame.data[c][:])
 
     def equality(self, column, indexes=None, value=None):
         """
@@ -1046,7 +1061,7 @@ def reset_index(self, drop=False):
 
 
 # DataFrame creation functions
-def from_json(json_string: str):
+def from_json(json_string):
     """
     Creates and return a DataFrame from a JSON of the type created by to_json
 

tests/test_dataframe.py

@@ -206,7 +206,7 @@ def test_rename_columns():
         df.rename_columns({'a2': 'a', 'bad': 'nogo'})
 
 
-def test_print():
+def test_show():
     df = rc.DataFrame({'a': [1, 2, 3], 'b': [1.0, 2.55, 3.1], 'c': ['first', 'second', None]}, columns=['b', 'c', 'a'],
                       index=['row1', 'row2', 'row3'], use_blist=True)
 
@@ -222,8 +222,8 @@ def test_print():
     actual = df.__str__()
     assert actual == expected
 
-    # print() method will pass along any argument for the tabulate.tabulate function
-    df.print()
+    # show() method will pass along any argument for the tabulate.tabulate function
+    df.show()
 
 
 def test_input_data_mutability():

tests/test_initialize.py

@@ -2,6 +2,8 @@
 import raccoon as rc
 from blist import blist
 
+import sys
+PYTHON3 = (sys.version_info >= (3, 0))
 
 def test_default_empty_init():
     actual = rc.DataFrame()
@@ -140,8 +142,9 @@ def test_sorted_init():
     assert df.data == [[1, 2, 3], [4, 5, 6]]
 
     # mixed type index will bork on sorted=True
-    with pytest.raises(TypeError):
-        rc.DataFrame({'a': [2, 1, 3], 'b': [5, 4, 6]}, index=[1, 'b', 3], sorted=True)
+    if PYTHON3:
+        with pytest.raises(TypeError):
+            rc.DataFrame({'a': [2, 1, 3], 'b': [5, 4, 6]}, index=[1, 'b', 3], sorted=True)
 
 
 def test_jagged_data():

tests/test_set.py

@@ -2,6 +2,9 @@
 import raccoon as rc
 from raccoon.utils import assert_frame_equal
 
+import sys
+PYTHON3 = (sys.version_info >= (3, 0))
+
 
 def test_set_cell():
     actual = rc.DataFrame({'a': [1, 2, 3], 'b': [4, 5, 6], 'c': [7, 8, 9]}, index=[10, 11, 12], columns=['a', 'b', 'c'],
@@ -73,8 +76,9 @@ def test_set_cell_sorted():
     assert all([isinstance(actual.data[x], list) for x in range(len(actual.columns))])
 
     # fails for mixed index type
-    with pytest.raises(TypeError):
-        actual.set('Z', 'e', 60)
+    if PYTHON3:
+        with pytest.raises(TypeError):
+            actual.set('Z', 'e', 60)
 
 
 def test_set_row():

tests/test_sort.py

@@ -3,6 +3,9 @@
 from raccoon.utils import assert_frame_equal
 from blist import blist
 
+import sys
+PYTHON3 = (sys.version_info >= (3, 0))
+
 
 def test_sort_index():
     # test on list
@@ -24,8 +27,9 @@ def test_sort_index():
 
     # fails on mixed type columns
     df = rc.DataFrame({'a': [1, 2, 3], 'b': [4, 5, 6]}, columns=['a', 'b'], index=[10, 'a', 9])
-    with pytest.raises(TypeError):
-        df.sort_index()
+    if PYTHON3:
+        with pytest.raises(TypeError):
+            df.sort_index()
 
 
 def test_sort_multi_index():
@@ -39,8 +43,9 @@ def test_sort_multi_index():
 
     # fails on mixed type columns
     df = rc.DataFrame({'a': [1, 2, 3], 'b': [4, 5, 6]}, columns=['a', 'b'], index=[(10, 'c'), 'a', (10, 'b')])
-    with pytest.raises(TypeError):
-        df.sort_index()
+    if PYTHON3:
+        with pytest.raises(TypeError):
+            df.sort_index()
 
 
 def test_sort_column():
@@ -64,4 +69,3 @@ def test_sort_column():
     assert isinstance(df.index, blist)
     assert_frame_equal(df, rc.DataFrame({'a': [1, 2, 3], 'b': ['c', 'a', 'b']}, columns=['a', 'b'], index=[8, 10, 9],
                                         use_blist=True))
-