Merge pull request #1288 from xl0/win-utf8

pass encoding=utf8 when opening files

Author: jph00

nbdev/clean.py

@@ -111,7 +111,7 @@ def _reconfigure(*strms):
 # %% ../nbs/api/11_clean.ipynb 28
 def process_write(warn_msg, proc_nb, f_in, f_out=None, disp=False):
     if not f_out: f_out = f_in
-    if isinstance(f_in, (str,Path)): f_in = Path(f_in).open()
+    if isinstance(f_in, (str,Path)): f_in = Path(f_in).open(encoding="utf-8")
     try:
         _reconfigure(f_in, f_out)
         nb = dict2nb(loads(f_in.read()))

nbdev/cli.py

@@ -42,7 +42,7 @@ def nbdev_filter(
     elif not nb_txt: nb_txt = sys.stdin.read()
     nb = dict2nb(loads(nb_txt))
     if printit:
-        with open(os.devnull, 'w') as dn:
+        with open(os.devnull, 'w', encoding="utf-8") as dn:
             with redirect_stdout(dn): filt(nb)
     else: filt(nb)
     res = nb2str(nb)

nbdev/config.py

@@ -271,7 +271,7 @@ def _basic_export_nb(fname, name, dest=None):
     exp_funcs = [f for f in funcs if f[0]!='_']
 
     # write out the file
-    with (dest/name).open('w') as f:
+    with (dest/name).open('w',encoding="utf-8") as f:
         f.write(f"# %% auto 0\n__all__ = {exp_funcs}")
         write_cells(cells, f"# %% {fname.relpath(dest)}", f)
         f.write('\n')

nbdev/maker.py

@@ -202,7 +202,7 @@ def make(self:ModuleMaker, cells, all_cells=None, lib_path=None):
         last_future = self._last_future(cells) if len(all_cells)>0 else 0
         tw = TextWrapper(width=120, initial_indent='', subsequent_indent=' '*11, break_long_words=False)
         all_str = '\n'.join(tw.wrap(str(_all)))
-    with self.fname.open('w') as f:
+    with self.fname.open('w', encoding="utf-8") as f:
         f.write(_retr_mdoc(cells))
         f.write(f"# AUTOGENERATED! DO NOT EDIT! File to edit: {self.dest2nb}.")
         if last_future > 0: write_cells(cells[:last_future], self.hdr, f)
@@ -220,7 +220,7 @@ def _make_exists(self:ModuleMaker, cells, all_cells=None):
     "`make` for `is_new=False`"
     if all_cells and self.parse:
         update_var('__all__', partial(self._update_all, all_cells), fn=self.fname)
-    with self.fname.open('a') as f: write_cells(cells, self.hdr, f)
+    with self.fname.open('a', encoding="utf-8") as f: write_cells(cells, self.hdr, f)
 
 # %% ../nbs/api/02_maker.ipynb 44
 def _basic_export_nb2(fname, name, dest=None):

nbdev/release.py

@@ -169,7 +169,7 @@ def pypi_details(name):
 
 def _run(cmd):
     res = ""
-    with Popen(shlex.split(cmd), stdout=PIPE, bufsize=1, text=True) as p:
+    with Popen(shlex.split(cmd), stdout=PIPE, bufsize=1, text=True, encoding="utf-8") as p:
         for line in p.stdout:
             print(line, end='')
             res += line
@@ -188,7 +188,7 @@ def _write_yaml(path, name, d1, d2):
     p = path/name
     p.mkdir(exist_ok=True, parents=True)
     yaml.SafeDumper.ignore_aliases = lambda *args : True
-    with (p/'meta.yaml').open('w') as f:
+    with (p/'meta.yaml').open('w', encoding="utf-8") as f:
         yaml.safe_dump(d1, f)
         yaml.safe_dump(d2, f)
 

nbs/api/01_config.ipynb

@@ -753,7 +753,7 @@
     "    exp_funcs = [f for f in funcs if f[0]!='_']\n",
     "\n",
     "    # write out the file\n",
-    "    with (dest/name).open('w') as f:\n",
+    "    with (dest/name).open('w',encoding=\"utf-8\") as f:\n",
     "        f.write(f\"# %% auto 0\\n__all__ = {exp_funcs}\")\n",
     "        write_cells(cells, f\"# %% {fname.relpath(dest)}\", f)\n",
     "        f.write('\\n')"

nbs/api/02_maker.ipynb

@@ -514,7 +514,7 @@
     "        last_future = self._last_future(cells) if len(all_cells)>0 else 0\n",
     "        tw = TextWrapper(width=120, initial_indent='', subsequent_indent=' '*11, break_long_words=False)\n",
     "        all_str = '\\n'.join(tw.wrap(str(_all)))\n",
-    "    with self.fname.open('w') as f:\n",
+    "    with self.fname.open('w', encoding=\"utf-8\") as f:\n",
     "        f.write(_retr_mdoc(cells))\n",
     "        f.write(f\"# AUTOGENERATED! DO NOT EDIT! File to edit: {self.dest2nb}.\")\n",
     "        if last_future > 0: write_cells(cells[:last_future], self.hdr, f)\n",
@@ -661,7 +661,7 @@
     "    \"`make` for `is_new=False`\"\n",
     "    if all_cells and self.parse:\n",
     "        update_var('__all__', partial(self._update_all, all_cells), fn=self.fname)\n",
-    "    with self.fname.open('a') as f: write_cells(cells, self.hdr, f)"
+    "    with self.fname.open('a', encoding=\"utf-8\") as f: write_cells(cells, self.hdr, f)"
    ]
   },
   {

nbs/api/11_clean.ipynb

@@ -365,7 +365,7 @@
     "#|export\n",
     "def process_write(warn_msg, proc_nb, f_in, f_out=None, disp=False):\n",
     "    if not f_out: f_out = f_in\n",
-    "    if isinstance(f_in, (str,Path)): f_in = Path(f_in).open()\n",
+    "    if isinstance(f_in, (str,Path)): f_in = Path(f_in).open(encoding=\"utf-8\")\n",
     "    try:\n",
     "        _reconfigure(f_in, f_out)\n",
     "        nb = dict2nb(loads(f_in.read()))\n",

nbs/api/13_cli.ipynb

@@ -95,7 +95,7 @@
     "    elif not nb_txt: nb_txt = sys.stdin.read()\n",
     "    nb = dict2nb(loads(nb_txt))\n",
     "    if printit:\n",
-    "        with open(os.devnull, 'w') as dn:\n",
+    "        with open(os.devnull, 'w', encoding=\"utf-8\") as dn:\n",
     "            with redirect_stdout(dn): filt(nb)\n",
     "    else: filt(nb)\n",
     "    res = nb2str(nb)\n",

nbs/api/18_release.ipynb

@@ -494,7 +494,7 @@
     "\n",
     "def _run(cmd):\n",
     "    res = \"\"\n",
-    "    with Popen(shlex.split(cmd), stdout=PIPE, bufsize=1, text=True) as p:\n",
+    "    with Popen(shlex.split(cmd), stdout=PIPE, bufsize=1, text=True, encoding=\"utf-8\") as p:\n",
     "        for line in p.stdout:\n",
     "            print(line, end='')\n",
     "            res += line\n",
@@ -527,7 +527,7 @@
     "    p = path/name\n",
     "    p.mkdir(exist_ok=True, parents=True)\n",
     "    yaml.SafeDumper.ignore_aliases = lambda *args : True\n",
-    "    with (p/'meta.yaml').open('w') as f:\n",
+    "    with (p/'meta.yaml').open('w', encoding=\"utf-8\") as f:\n",
     "        yaml.safe_dump(d1, f)\n",
     "        yaml.safe_dump(d2, f)"
    ]