Merge pull request #4024 from NickOveracker/master

fastai · Apr 17, 2024 · 37bc4db · 37bc4db
2 parents 1fec8a2 + b2c4d94
commit 37bc4db
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/fastai/text/data.py b/fastai/text/data.py
@@ -278,9 +278,9 @@ def from_df(cls, df, path='.', valid_pct=0.2, seed=None, text_col=0, label_col=1
         return cls.from_dblock(dblock, df, path=path, seq_len=seq_len, **kwargs)
 
     @classmethod
-    def from_csv(cls, path, csv_fname='labels.csv', header='infer', delimiter=None, **kwargs):
+    def from_csv(cls, path, csv_fname='labels.csv', header='infer', delimiter=None, quoting=csv.QUOTE_MINIMAL, **kwargs):
         "Create from `csv` file in `path/csv_fname`"
-        df = pd.read_csv(Path(path)/csv_fname, header=header, delimiter=delimiter)
+        df = pd.read_csv(Path(path)/csv_fname, header=header, delimiter=delimiter, quoting=quoting)
         return cls.from_df(df, path=path, **kwargs)
 
 TextDataLoaders.from_csv = delegates(to=TextDataLoaders.from_df)(TextDataLoaders.from_csv)
diff --git a/fastai/vision/data.py b/fastai/vision/data.py
@@ -178,9 +178,9 @@ def from_df(cls, df, path='.', valid_pct=0.2, seed=None, fn_col=0, folder=None,
         return cls.from_dblock(dblock, df, path=path, **kwargs)
 
     @classmethod
-    def from_csv(cls, path, csv_fname='labels.csv', header='infer', delimiter=None, **kwargs):
+    def from_csv(cls, path, csv_fname='labels.csv', header='infer', delimiter=None, quoting=csv.QUOTE_MINIMAL, **kwargs):
         "Create from `path/csv_fname` using `fn_col` and `label_col`"
-        df = pd.read_csv(Path(path)/csv_fname, header=header, delimiter=delimiter)
+        df = pd.read_csv(Path(path)/csv_fname, header=header, delimiter=delimiter, quoting=quoting)
         return cls.from_df(df, path=path, **kwargs)
 
     @classmethod

diff --git a/nbs/08_vision.data.ipynb b/nbs/08_vision.data.ipynb
@@ -464,9 +464,9 @@
     "        return cls.from_dblock(dblock, df, path=path, **kwargs)\n",
     "\n",
     "    @classmethod\n",
-    "    def from_csv(cls, path, csv_fname='labels.csv', header='infer', delimiter=None, **kwargs):\n",
+    "    def from_csv(cls, path, csv_fname='labels.csv', header='infer', delimiter=None, quoting=csv.QUOTE_MINIMAL, **kwargs):\n",
     "        \"Create from `path/csv_fname` using `fn_col` and `label_col`\"\n",
-    "        df = pd.read_csv(Path(path)/csv_fname, header=header, delimiter=delimiter)\n",
+    "        df = pd.read_csv(Path(path)/csv_fname, header=header, delimiter=delimiter, quoting=quoting)\n",
     "        return cls.from_df(df, path=path, **kwargs)\n",
     "\n",
     "    @classmethod\n",

diff --git a/nbs/31_text.data.ipynb b/nbs/31_text.data.ipynb
@@ -1174,9 +1174,9 @@
     "        return cls.from_dblock(dblock, df, path=path, seq_len=seq_len, **kwargs)\n",
     "\n",
     "    @classmethod\n",
-    "    def from_csv(cls, path, csv_fname='labels.csv', header='infer', delimiter=None, **kwargs):\n",
+    "    def from_csv(cls, path, csv_fname='labels.csv', header='infer', delimiter=None, quoting=csv.QUOTE_MINIMAL, **kwargs):\n",
     "        \"Create from `csv` file in `path/csv_fname`\"\n",
-    "        df = pd.read_csv(Path(path)/csv_fname, header=header, delimiter=delimiter)\n",
+    "        df = pd.read_csv(Path(path)/csv_fname, header=header, delimiter=delimiter, quoting=quoting)\n",
     "        return cls.from_df(df, path=path, **kwargs)\n",
     "\n",
     "TextDataLoaders.from_csv = delegates(to=TextDataLoaders.from_df)(TextDataLoaders.from_csv)"