fixes #121

Author: jph00

fastcore/_nbdev.py

@@ -107,10 +107,8 @@
          "using_attr": "02_utils.ipynb",
          "Self": "02_utils.ipynb",
          "Path.readlines": "02_utils.ipynb",
-         "Path.read": "02_utils.ipynb",
-         "Path.write": "02_utils.ipynb",
-         "Path.save": "02_utils.ipynb",
-         "Path.load": "02_utils.ipynb",
+         "save_pickle": "02_utils.ipynb",
+         "load_pickle": "02_utils.ipynb",
          "Path.ls": "02_utils.ipynb",
          "Path.__repr__": "02_utils.ipynb",
          "remove_patches_path": "02_utils.ipynb",

fastcore/utils.py

@@ -7,9 +7,10 @@
            'Float', 'tuplify', 'detuplify', 'replicate', 'uniqueify', 'setify', 'merge', 'is_listy', 'range_of',
            'groupby', 'last_index', 'shufflish', 'IterLen', 'ReindexCollection', 'num_methods', 'rnum_methods',
            'inum_methods', 'fastuple', 'trace', 'compose', 'maps', 'partialler', 'mapped', 'instantiate', 'using_attr',
-           'Self', 'Self', 'remove_patches_path', 'bunzip', 'join_path_file', 'urlread', 'urljson', 'run', 'do_request',
-           'sort_by_run', 'PrettyString', 'round_multiple', 'even_mults', 'num_cpus', 'add_props', 'ContextManagers',
-           'set_num_threads', 'ProcessPoolExecutor', 'ThreadPoolExecutor', 'parallel', 'run_procs', 'parallel_gen']
+           'Self', 'Self', 'save_pickle', 'load_pickle', 'remove_patches_path', 'bunzip', 'join_path_file', 'urlread',
+           'urljson', 'run', 'do_request', 'sort_by_run', 'PrettyString', 'round_multiple', 'even_mults', 'num_cpus',
+           'add_props', 'ContextManagers', 'set_num_threads', 'ProcessPoolExecutor', 'ThreadPoolExecutor', 'parallel',
+           'run_procs', 'parallel_gen']
 
 # Cell
 from .imports import *
@@ -509,30 +510,17 @@ def readlines(self:Path, hint=-1, encoding='utf8'):
     with self.open(encoding=encoding) as f: return f.readlines(hint)
 
 # Cell
-@patch
-def read(self:Path, size=-1, encoding='utf8'):
-    "Read the content of `fname`"
-    with self.open(encoding=encoding) as f: return f.read(size)
-
-# Cell
-@patch
-def write(self:Path, txt, encoding='utf8'):
-    "Write `txt` to `self`, creating directories as needed"
-    self.parent.mkdir(parents=True,exist_ok=True)
-    with self.open('w', encoding=encoding) as f: f.write(txt)
-
-# Cell
-@patch
-def save(fn:Path, o):
+def save_pickle(fn, o):
     "Save a pickle file, to a file name or opened file"
+    fn = Path(fn)
     if not isinstance(fn, io.IOBase): fn = open(fn,'wb')
     try: pickle.dump(o, fn)
     finally: fn.close()
 
 # Cell
-@patch
-def load(fn:Path):
+def load_pickle(fn):
     "Load a pickle file from a file name or opened file"
+    fn = Path(fn)
     if not isinstance(fn, io.IOBase): fn = open(fn,'rb')
     try: return pickle.load(fn)
     finally: fn.close()

nbs/02_utils.ipynb

@@ -295,7 +295,7 @@
     {
      "data": {
       "text/plain": [
-       "<__main__._t at 0x7fe83401cca0>"
+       "<__main__._t at 0x7fcf69d97d10>"
       ]
      },
      "execution_count": null,
@@ -2170,7 +2170,7 @@
     {
      "data": {
       "text/plain": [
-       "['h', 'c', 'e', 'a', 'g', 'b', 'f', 'd']"
+       "['b', 'f', 'h', 'a', 'c', 'g', 'e', 'd']"
       ]
      },
      "execution_count": null,
@@ -2889,51 +2889,9 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "@patch\n",
-    "def read(self:Path, size=-1, encoding='utf8'):\n",
-    "    \"Read the content of `fname`\"\n",
-    "    with self.open(encoding=encoding) as f: return f.read(size)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#export\n",
-    "@patch\n",
-    "def write(self:Path, txt, encoding='utf8'):\n",
-    "    \"Write `txt` to `self`, creating directories as needed\"\n",
-    "    self.parent.mkdir(parents=True,exist_ok=True)\n",
-    "    with self.open('w', encoding=encoding) as f: f.write(txt)"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "with tempfile.NamedTemporaryFile() as f:\n",
-    "    fn = Path(f.name)\n",
-    "    fn.write('t')\n",
-    "    t = fn.read()\n",
-    "    test_eq(t,'t')\n",
-    "    t = fn.readlines()\n",
-    "    test_eq(t,['t'])"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "#export\n",
-    "@patch\n",
-    "def save(fn:Path, o):\n",
+    "def save_pickle(fn, o):\n",
     "    \"Save a pickle file, to a file name or opened file\"\n",
+    "    fn = Path(fn)\n",
     "    if not isinstance(fn, io.IOBase): fn = open(fn,'wb')\n",
     "    try: pickle.dump(o, fn)\n",
     "    finally: fn.close()"
@@ -2946,9 +2904,9 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "@patch\n",
-    "def load(fn:Path):\n",
+    "def load_pickle(fn):\n",
     "    \"Load a pickle file from a file name or opened file\"\n",
+    "    fn = Path(fn)\n",
     "    if not isinstance(fn, io.IOBase): fn = open(fn,'rb')\n",
     "    try: return pickle.load(fn)\n",
     "    finally: fn.close()"
@@ -2962,8 +2920,8 @@
    "source": [
     "with tempfile.NamedTemporaryFile() as f:\n",
     "    fn = Path(f.name)\n",
-    "    fn.save('t')\n",
-    "    t = fn.load()\n",
+    "    save_pickle(fn, 't')\n",
+    "    t = load_pickle(fn)\n",
     "test_eq(t,'t')"
    ]
   },
@@ -3939,11 +3897,11 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "0 2020-09-14 13:38:06.317966\n",
-      "1 2020-09-14 13:38:06.568367\n",
-      "2 2020-09-14 13:38:06.818557\n",
-      "3 2020-09-14 13:38:07.069433\n",
-      "4 2020-09-14 13:38:07.319457\n"
+      "0 2020-10-08 18:02:47.582440\n",
+      "1 2020-10-08 18:02:47.833442\n",
+      "2 2020-10-08 18:02:48.083059\n",
+      "3 2020-10-08 18:02:48.334451\n",
+      "4 2020-10-08 18:02:48.584491\n"
      ]
     }
    ],