Update signature functions

Author: chfw

README.rst

@@ -66,19 +66,19 @@ Write to an xlsx file
 
 Here's the sample code to write a dictionary to an xlsx file::
 
-    >>> from pyexcel_xlsx import store_data
+    >>> from pyexcel_xlsx import save_data
     >>> data = OrderedDict() # from collections import OrderedDict
     >>> data.update({"Sheet 1": [[1, 2, 3], [4, 5, 6]]})
     >>> data.update({"Sheet 2": [["row 1", "row 2", "row 3"]]})
-    >>> store_data("your_file.xlsx", data)
+    >>> save_data("your_file.xlsx", data)
 
 Read from an xlsx file
 **********************
 
 Here's the sample code::
 
-    >>> from pyexcel_xlsx import load_data
-    >>> data = load_data("your_file.xlsx")
+    >>> from pyexcel_xlsx import get_data
+    >>> data = get_data("your_file.xlsx")
     >>> import json
     >>> print(json.dumps(data))
     {"Sheet 1": [[1, 2, 3], [4, 5, 6]], "Sheet 2": [["row 1", "row 2", "row 3"]]}
@@ -88,12 +88,12 @@ Write an xlsx to memory
 
 Here's the sample code to write a dictionary to an xlsx file::
 
-    >>> from pyexcel_xlsx import store_data
+    >>> from pyexcel_xlsx import save_data
     >>> data = OrderedDict()
     >>> data.update({"Sheet 1": [[1, 2, 3], [4, 5, 6]]})
     >>> data.update({"Sheet 2": [[7, 8, 9], [10, 11, 12]]})
     >>> io = StringIO()
-    >>> store_data(io, data)
+    >>> save_data(io, data)
     >>> # do something with the io
     >>> # In reality, you might give it to your http response
     >>> # object for downloading
@@ -107,7 +107,7 @@ Continue from previous example::
     >>> # This is just an illustration
     >>> # In reality, you might deal with xlsx file upload
     >>> # where you will read from requests.FILES['YOUR_XLSX_FILE']
-    >>> data = load_data(io)
+    >>> data = get_data(io)
     >>> print(json.dumps(data))
     {"Sheet 1": [[1, 2, 3], [4, 5, 6]], "Sheet 2": [[7, 8, 9], [10, 11, 12]]}
 

pyexcel_xlsx/__init__.py

@@ -17,6 +17,7 @@
     READERS,
     WRITERS,
     isstream,
+    is_string,
     load_data as read_data,
     store_data as write_data
 )
@@ -151,25 +152,13 @@ def close(self):
     "xlsx": XLSXWriter
 })
 
-def is_string(atype):
-    """find out if a type is str or not"""
-    if atype == str:
-            return True
-    elif PY2:
-        if atype == unicode:
-            return True
-        elif atype == str:
-            return True
-    return False
-
-
-def store_data(afile, data, file_type=None, **keywords):
+def save_data(afile, data, file_type=None, **keywords):
     if isstream(afile) and file_type is None:
         file_type='xlsx'
     write_data(afile, data, file_type=file_type, **keywords)
 
 
-def load_data(afile, file_type=None, **keywords):
+def get_data(afile, file_type=None, **keywords):
     if isstream(afile) and file_type is None:
         file_type='xlsx'
     return read_data(afile, file_type=file_type, **keywords)