diff options
| author | Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net> | 2016-07-13 23:53:23 +0200 |
|---|---|---|
| committer | Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net> | 2016-07-13 23:53:23 +0200 |
| commit | ab60ba322c871f69eefa38a278d400406f653d98 (patch) | |
| tree | 8275293955e0ebe320f824c96a8e533467a57187 /ishtar_common/data_importer.py | |
| parent | 0d8cea5fd17454b665999cc826d96fd3e0ec5ff0 (diff) | |
| parent | 0b73283196db3976c7387a86b244e6c01c581879 (diff) | |
| download | Ishtar-ab60ba322c871f69eefa38a278d400406f653d98.tar.bz2 Ishtar-ab60ba322c871f69eefa38a278d400406f653d98.zip | |
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
Diffstat (limited to 'ishtar_common/data_importer.py')
| -rw-r--r-- | ishtar_common/data_importer.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index 481098244..834ba0ed9 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -21,6 +21,7 @@ import copy import csv import datetime import io +import os import logging import re import sys @@ -495,15 +496,13 @@ class FileFormater(Formater): filename = settings.MEDIA_ROOT + 'imported/' + \ u".".join(items[:-1]) + u'.' + items[-1] try: - current_size = 0 with open(filename, 'w') as f: with zp.open(value) as z: f.write(z.read()) - current_size = f.size f = open(filename, 'r') my_file = File(f) # manualy set the file size because of an issue with TempFile - my_file.size = current_size + my_file.size = os.stat(filename).st_size return my_file except KeyError: raise ValueError(_(u"\"%(value)s\" is not a valid path for the " |