Fixed failing tests

johnchase · Apr 1, 2015 · ca2a9d0 · ca2a9d0
1 parent 5ef96b7
commit ca2a9d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/bcgenerator/tests/test_IDgenerator.py b/bcgenerator/tests/test_IDgenerator.py
@@ -27,7 +27,7 @@ def test_base36_to_base10(self):
 
     def test_encode(self):
         obs = encode(999999)
-        exp = (51253930955819896761L, 'ATEIQ6KK5O0XL')
+        exp = (26589444225832484022L, '5M0IBBZ17246U')
         self.assertEqual(obs, exp)
 
     def test_decode(self):

diff --git a/bcgenerator/util.py b/bcgenerator/util.py
@@ -11,15 +11,12 @@
 
 def get_ids(input_fh):
 
-    if type(input_fh) == file:
-        id_df = pd.read_csv(input_fh)
-        id_list = list(id_df.ix[:, 0])
-
-    elif type(input_fh) == str:
-        id_list = input_fh.split('\n')[1:]
-
-    else:
-        print type(input_fh)
+    # if type(input_fh) == file:
+    id_df = pd.read_csv(input_fh)
+    id_list = list(id_df.ix[:, 0])
+    #
+    # elif type(input_fh) == str:
+    #     id_list = input_fh.split('\n')[1:]
     return id_list