diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-20 17:46:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-20 17:46:46 +0200 |
| commit | 3dd84f9db3fbe9ba8472d7edec8fe07eb5635fe0 (patch) | |
| tree | 78e2c9558cb1b75bb4da034c6d98e7a83a0b2ef1 | |
| parent | cd1fcb7f22cd2a5de22a33eade9ab4d38b2fa54a (diff) | |
| parent | c42486f81b042d18b9cf825da9f35a83e00bc051 (diff) | |
| download | Ishtar-3dd84f9db3fbe9ba8472d7edec8fe07eb5635fe0.tar.bz2 Ishtar-3dd84f9db3fbe9ba8472d7edec8fe07eb5635fe0.zip | |
Merge branch 'v0.9' into wheezy
| -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 [] |