From 4cc5612d9c4626e23312f4830a6dde974bda0c41 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 25 Jan 2015 14:18:36 +0100 Subject: Archaeological operations: fix bad imports --- archaeological_operations/import_from_csv.py | 4 +--- archaeological_operations/utils.py | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) (limited to 'archaeological_operations') 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): -- cgit v1.2.3