Run through 2-to-3 converter. This is not in a working state

This commit is contained in:
David Taylor
2017-06-21 11:27:53 +01:00
committed by Tom Price
parent 98182143ec
commit 3035320e82
44 changed files with 97 additions and 96 deletions

View File

@@ -31,7 +31,7 @@ def setup_cursor():
return cursor
except ConnectionDoesNotExist:
print("Legacy database is not configured")
print(connections._databases)
print((connections._databases))
return None
@@ -55,13 +55,13 @@ def import_users(delete=False):
object.initials = row[6]
object.phone = row[7]
object.save()
print("Updated " + str(object))
print(("Updated " + str(object)))
except ObjectDoesNotExist:
object = models.Profile(pk=row[0], username=row[1], email=row[2], first_name=row[3], last_name=row[4],
is_active=row[5], initials=row[6], phone=row[7])
object.set_password(uuid.uuid4().hex)
object.save()
print("Created " + str(object))
print(("Created " + str(object)))
def import_people(delete=False):
@@ -85,15 +85,15 @@ def import_people(delete=False):
if row[5] != "Normal":
notes = row[5]
print("Trying %s %s %s" % (pk, name, phone))
print(("Trying %s %s %s" % (pk, name, phone)))
person, created = models.Person.objects.get_or_create(pk=pk, name=name, phone=phone, email=email,
address=address, notes=notes)
if created:
print("Created: " + person.__str__())
print(("Created: " + person.__str__()))
with reversion.create_revision():
person.save()
else:
print("Found: " + person.__str__())
print(("Found: " + person.__str__()))
def import_organisations(delete=False):
@@ -113,11 +113,11 @@ def import_organisations(delete=False):
address=row[3],
union_account=row[4], notes=notes)
if created:
print("Created: " + object.__str__())
print(("Created: " + object.__str__()))
with reversion.create_revision():
object.save()
else:
print("Found: " + object.__str__())
print(("Found: " + object.__str__()))
def import_vat_rates(delete=False):
@@ -133,11 +133,11 @@ def import_vat_rates(delete=False):
object, created = models.VatRate.objects.get_or_create(pk=row[0], start_at=start_at,
comment=row[3], rate=row[4])
if created:
print("Created: " + object.__str__())
print(("Created: " + object.__str__()))
with reversion.create_revision():
object.save()
else:
print("Found: " + object.__str__())
print(("Found: " + object.__str__()))
def import_venues(delete=False):
@@ -295,11 +295,11 @@ def import_invoices(delete=False):
cursor.execute(sql)
for row in cursor.fetchall():
print(row)
print row[1]
print(row[1])
try:
event = models.Event.objects.get(pk=row[1])
except ObjectDoesNotExist:
print "Event %d not found" % row[1]
print("Event %d not found" % row[1])
continue
print(event)