diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-20 17:46:38 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-20 17:46:38 +0200 |
| commit | c42486f81b042d18b9cf825da9f35a83e00bc051 (patch) | |
| tree | 4d6fb44ffc6a8ba18784111894c5c6b810b7236d | |
| parent | 1b246239c77b23c5b8d062057d2bf885716a0e15 (diff) | |
| parent | bc959913ada31882c49bbfe510933edc9f043444 (diff) | |
| download | Ishtar-c42486f81b042d18b9cf825da9f35a83e00bc051.tar.bz2 Ishtar-c42486f81b042d18b9cf825da9f35a83e00bc051.zip | |
Merge branch 'master' into v0.9
| -rw-r--r-- | ishtar_common/models.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index e49044cfd..7f79df72f 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2475,10 +2475,9 @@ class Import(models.Model): encoding=encoding)] if tmpdir: shutil.rmtree(tmpdir) - print(encoding, imported_file, vals[0]) return vals except UnicodeDecodeError: - print(encoding, encodings) + pass # try the next encoding if tmpdir: shutil.rmtree(tmpdir) return [] |