Changeset 2200

Timestamp:

Feb 27, 2009, 2:56:51 AM (16 years ago)

Author:

price

Message:

fix more imports EIBTI-style

Location:

trunk/packages/invirt-database

Files:

• debian/changelog (modified) (1 diff)
• python/database/models.py (modified) (2 diffs)
• python/database/owner.py (modified) (1 diff)

trunk/packages/invirt-database/debian/changelog

@@ -14 +14 @@
   * refactor code that sets values
   * print full help on no arguments
+
+  all:
   * make EIBTI imports
 
- -- Greg Price <price@mit.edu>  Fri, 27 Feb 2009 02:16:28 -0500
+ -- Greg Price <price@mit.edu>  Fri, 27 Feb 2009 02:29:29 -0500
 
 invirt-database (0.1.7) unstable; urgency=low

trunk/packages/invirt-database/python/database/models.py

@@ -6 +6 @@
 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',
@@ -102 +102 @@
        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'
 

trunk/packages/invirt-database/python/database/owner.py

@@ -1 @@
-from record import Record
+from invirt.database import record
 
-class Owner(Record):
+class Owner(record.Record):
     _f = {
         'ram_quota_total': (512, 'MiB'),