Allow empty/Excel files by handling 'None' encoding (#228)

* Allow empty files, handle 'None' encoding * Only set encoding if encoding was detected
frictionlessdata · Oct 18, 2018 · cf56286 · cf56286
1 parent bb79bbf
commit cf56286
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/data/empty.csv b/data/empty.csv
diff --git a/datapackage/resource.py b/datapackage/resource.py
@@ -253,8 +253,10 @@ def infer(self, **options):
                     for chunk in stream:
                         contents += chunk
                         if len(contents) > 1000: break
-                encoding = cchardet.detect(contents)['encoding'].lower()
-                descriptor['encoding'] = 'utf-8' if encoding == 'ascii' else encoding
+                encoding = cchardet.detect(contents)['encoding']
+                if encoding is not None:
+                    encoding = encoding.lower()
+                    descriptor['encoding'] = 'utf-8' if encoding == 'ascii' else encoding
 
         # Schema
         if not descriptor.get('schema'):

diff --git a/tests/test_infer.py b/tests/test_infer.py
@@ -29,3 +29,7 @@ def test_infer():
 def test_infer_non_utf8_file():
     descriptor = infer('data/data_with_accents.csv')
     assert descriptor['resources'][0]['encoding'] == 'iso-8859-1'
+
+def test_infer_empty_file():
+    descriptor = infer('data/empty.csv')
+    assert descriptor['resources'][0].get('encoding') is None