remove deprecated functions

pyexcel · Dec 15, 2016 · e8fa729 · e8fa729
1 parent e9aa0e2
commit e8fa729
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 51 deletions.
diff --git a/pyexcel_io/deprecated.py b/pyexcel_io/deprecated.py
diff --git a/pyexcel_io/io.py b/pyexcel_io/io.py
@@ -25,15 +25,15 @@ def get_data(afile, file_type=None, streaming=False, **keywords):
     if isstream(afile) and file_type is None:
         file_type = constants.FILE_FORMAT_CSV
     if isstream(afile):
-        data = load_data_new(file_stream=afile,
-                             file_type=file_type, **keywords)
+        data = load_data(file_stream=afile,
+                         file_type=file_type, **keywords)
     else:
         if afile is not None and file_type is not None:
-            data = load_data_new(file_content=afile,
-                                 file_type=file_type, **keywords)
+            data = load_data(file_content=afile,
+                             file_type=file_type, **keywords)
         else:
-            data = load_data_new(file_name=afile,
-                                 file_type=file_type, **keywords)
+            data = load_data(file_name=afile,
+                             file_type=file_type, **keywords)
     if streaming is False:
         for key in data.keys():
             data[key] = list(data[key])
@@ -84,27 +84,27 @@ def store_data(afile, data, file_type=None, **keywords):
     :param keywords: any other parameters
     """
     if isstream(afile):
-        writer = get_writer_new(
+        writer = get_writer(
             file_stream=afile,
             file_type=file_type,
             **keywords)
     else:
-        writer = get_writer_new(
+        writer = get_writer(
             file_name=afile,
             file_type=file_type,
             **keywords)
     writer.write(data)
     writer.close()
 
 
-def load_data_new(file_name=None,
-                  file_content=None,
-                  file_stream=None,
-                  file_type=None,
-                  sheet_name=None,
-                  sheet_index=None,
-                  library=None,
-                  **keywords):
+def load_data(file_name=None,
+              file_content=None,
+              file_stream=None,
+              file_type=None,
+              sheet_name=None,
+              sheet_index=None,
+              library=None,
+              **keywords):
     """Load data from any supported excel formats
 
     :param filename: actual file name, a file stream or actual content
@@ -140,8 +140,8 @@ def load_data_new(file_name=None,
     return result
 
 
-def get_writer_new(file_name=None, file_stream=None,
-                   file_type=None, library=None, **keywords):
+def get_writer(file_name=None, file_stream=None,
+               file_type=None, library=None, **keywords):
     number_of_none_inputs = list(filter(lambda x: x is not None,
                                         [file_name, file_stream]))
 

diff --git a/tests/test_io.py b/tests/test_io.py
@@ -1,37 +1,26 @@
 import os
 import sys
 from unittest import TestCase
-from pyexcel_io.deprecated import load_data, get_writer
 import pyexcel_io.manager as manager
 from pyexcel_io._compact import StringIO, BytesIO, is_string
 from pyexcel_io._compact import OrderedDict
 from pyexcel_io import save_data, get_data
-from pyexcel_io.io import load_data_new, get_writer_new
+from pyexcel_io.io import load_data, get_writer
 from nose.tools import raises, eq_
 from zipfile import BadZipfile
 
 
 PY2 = sys.version_info[0] == 2
 
 
-@raises(NotImplementedError)
-def test_not_implemented_1():
-    load_data("something")
-
-
-@raises(NotImplementedError)
-def test_not_implemented_2():
-    get_writer("something")
-
-
 @raises(IOError)
 def test_no_valid_parameters():
-    load_data_new()
+    load_data()
 
 
 @raises(IOError)
 def test_no_valid_parameters_2():
-    get_writer_new()
+    get_writer()
 
 
 @raises(IOError)
@@ -46,12 +35,12 @@ def test_wrong_parameter_to_get_data():
 
 @raises(Exception)
 def test_wrong_parameter_to_get_writer():
-    get_writer_new(1)
+    get_writer(1)
 
 
 @raises(NotImplementedError)
 def test_wrong_parameter_to_get_writer2():
-    get_writer_new(1, file_type="csv")
+    get_writer(1, file_type="csv")
 
 
 @raises(IOError)
@@ -99,7 +88,7 @@ def test_write_unknown_data():
 def test_writer_csvz_data_from_memory():
     if not PY2:
         io = StringIO()
-        writer = get_writer_new(io, file_type="csvz")
+        writer = get_writer(io, file_type="csvz")
         writer.write({'adb': [[2, 3]]})
     else:
         raise NotImplementedError("pass it")
@@ -108,15 +97,15 @@ def test_writer_csvz_data_from_memory():
 @raises(IOError)
 def test_writer_xlsm_data_from_memory2():
     io = BytesIO()
-    get_writer_new(io, file_type="xlsms")
+    get_writer(io, file_type="xlsms")
 
 
 @raises(IOError)
 def test_writer_unknown_data_from_memory2():
     io = BytesIO()
     # mock it
     manager.register_stream_type('unknown1', 'text')
-    get_writer_new(io, file_type="unknown1")
+    get_writer(io, file_type="unknown1")
 
 
 def test_get_io():