diff options
Diffstat (limited to 'ishtar_common/data_importer.py')
| -rw-r--r-- | ishtar_common/data_importer.py | 8 | 
1 files changed, 3 insertions, 5 deletions
| diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py index d4c4ba786..4eb403c44 100644 --- a/ishtar_common/data_importer.py +++ b/ishtar_common/data_importer.py @@ -27,6 +27,7 @@ import zipfile  from django.conf import settings  from django.contrib.auth.models import User +from django.contrib.gis.geos.error import GEOSException  from django.db.models.fields import FieldDoesNotExist  from django.core.exceptions import FieldError  from django.core.files import File @@ -1794,11 +1795,8 @@ class Importer(object):                  if not self.simulate and self.import_instance and \                          hasattr(obj, 'imports') and created:                      obj.imports.add(self.import_instance) -            except ValueError as e: -                raise IntegrityError(e.message) -            except IntegrityError as e: -                raise IntegrityError(e.message) -            except DatabaseError as e: +            except (ValueError, IntegrityError, DatabaseError, +                    GEOSException) as e:                  raise IntegrityError(e.message)              except cls.MultipleObjectsReturned as e:                  created = False | 
