summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2015-01-25 14:18:36 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2015-01-25 14:18:36 +0100
commitedff76451ff472fa1af8e34ab72020662e89c12d (patch)
treef578525a6e776d44cd70af85c71d8b1976462718
parent61e47118daaf0eb4fb7d8f119e43fd91d5e0a8d1 (diff)
downloadIshtar-edff76451ff472fa1af8e34ab72020662e89c12d.tar.bz2
Ishtar-edff76451ff472fa1af8e34ab72020662e89c12d.zip
Archaeological operations: fix bad imports
-rw-r--r--archaeological_operations/import_from_csv.py4
-rw-r--r--archaeological_operations/utils.py17
2 files changed, 18 insertions, 3 deletions
diff --git a/archaeological_operations/import_from_csv.py b/archaeological_operations/import_from_csv.py
index 878d95ce4..714825ff4 100644
--- a/archaeological_operations/import_from_csv.py
+++ b/archaeological_operations/import_from_csv.py
@@ -29,20 +29,18 @@ import csv, codecs
import re
from django.conf import settings
-from django.contrib.auth.models import User
from django.db import transaction
from django.template.defaultfilters import slugify
from archaeological_operations.utils import *
+from django.contrib.auth.models import User
from ishtar_common.models import Town, Person, PersonType, OrganizationType, \
Organization, SourceType
from archaeological_files.models import PermitType, File, FileType
from archaeological_operations.models import Operation, OperationType, Period, \
AdministrativeAct, ActType, OperationSource, Parcel
-DEFAULT_PERSON = User.objects.order_by('pk').all()[0]
-
class Column:
def __init__(self, col_models, format, associated_cols=None, multi=False):
self.col_models, self.format = col_models, format
diff --git a/archaeological_operations/utils.py b/archaeological_operations/utils.py
index fc01407ea..dcae8a3a8 100644
--- a/archaeological_operations/utils.py
+++ b/archaeological_operations/utils.py
@@ -17,8 +17,25 @@
# See the file COPYING for details.
+DELIMITER = ";"
+QUOTECHAR = '"'
+
+import datetime
+import csv, codecs
import re
+
from django.conf import settings
+from django.db import transaction
+from django.template.defaultfilters import slugify
+
+from django.contrib.auth.models import User
+from ishtar_common.models import Town, Person, PersonType, OrganizationType, \
+ Organization, SourceType
+from archaeological_files.models import PermitType, File, FileType
+from archaeological_operations.models import Operation, OperationType, Period, \
+ AdministrativeAct, ActType, OperationSource, Parcel
+
+DEFAULT_PERSON = User.objects.order_by('pk').all()[0]
def _get_parse_string(trunc_number=None):
def parse_string(value):