From 66d08ff5bec3db89c6bedf399c0b6f5ae5f821c5 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Fri, 27 Feb 2009 02:56:51 -0500 Subject: [PATCH] fix more imports EIBTI-style svn path=/trunk/packages/invirt-database/; revision=2200 --- debian/changelog | 4 +++- python/database/models.py | 20 ++++++++++---------- python/database/owner.py | 4 ++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index d187a03..4d5e96d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,9 +13,11 @@ invirt-database (0.1.8) unstable; urgency=low invirt-quota: * refactor code that sets values * print full help on no arguments + + all: * make EIBTI imports - -- Greg Price Fri, 27 Feb 2009 02:16:28 -0500 + -- Greg Price Fri, 27 Feb 2009 02:29:29 -0500 invirt-database (0.1.7) unstable; urgency=low diff --git a/python/database/models.py b/python/database/models.py index 6b53a2a..02b5092 100644 --- a/python/database/models.py +++ b/python/database/models.py @@ -5,8 +5,8 @@ from sqlalchemy.orm import create_session, relation from sqlalchemy.ext.sessioncontext import SessionContext from sqlalchemy.ext.assignmapper import assign_mapper -from record import * -from owner import Owner +from invirt.database import record +from invirt.database.owner import Owner __all__ = ['meta', 'session', @@ -101,28 +101,28 @@ machine_access_table = Table('machine_access', meta, Column('user', String, nullable=False, index=True), PrimaryKeyConstraint('machine_id', 'user')) -class Machine(Record): +class Machine(record.Record): _identity_field = 'name' -class MachineAccess(Record): +class MachineAccess(record.Record): pass -class NIC(Record): +class NIC(record.Record): pass -class Disk(Record): +class Disk(record.Record): pass -class Type(Record): +class Type(record.Record): _identity_field = 'type_id' -class Mirror(Record): +class Mirror(record.Record): _identity_field = 'mirror_id' -class CDROM(Record): +class CDROM(record.Record): _identity_field = 'cdrom_id' -class Autoinstall(Record): +class Autoinstall(record.Record): _identity_field = 'autoinstall_id' session.mapper(Machine, machine_table, diff --git a/python/database/owner.py b/python/database/owner.py index 4988bf3..1a27c9b 100755 --- a/python/database/owner.py +++ b/python/database/owner.py @@ -1,6 +1,6 @@ -from record import Record +from invirt.database import record -class Owner(Record): +class Owner(record.Record): _f = { 'ram_quota_total': (512, 'MiB'), 'ram_quota_single': (512, 'MiB'), -- 1.7.9.5