From 5b1616bff43ee67f0307a9e8b2233d1f1ed8472c Mon Sep 17 00:00:00 2001
From: Justin Shepherd <jshepher@rackspace.com>
Date: Tue, 10 May 2011 17:00:24 -0500
Subject: removed unused wild card imports, replaced sqlalchemy wildcard import
 with explicit imports

previous pylint score: 	-32.76/10
new pylint score:	4.44/10
---
 .../migrate_repo/versions/014_add_instance_type_id_to_instances.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py
index 334d1f255..bb4a9619c 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py
@@ -14,16 +14,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from sqlalchemy.sql import text
-from migrate import *
-
+from sqlalchemy import MetaData, Column, String, Table, Integer
 #from nova import log as logging
 
-
 meta = MetaData()
 
-
 c_instance_type = Column('instance_type',
                            String(length=255, convert_unicode=False,
                                   assert_unicode=None, unicode_error=None,
-- 
cgit 


From 849c5f10dc15d9c2272d5768748feac1ded6b635 Mon Sep 17 00:00:00 2001
From: Justin Shepherd <jshepher@rackspace.com>
Date: Tue, 10 May 2011 17:12:09 -0500
Subject: removed unused wild card imports, replaced sqlalchemy wildcard import
 with explicit imports

  previous pylint score: -75.00/10
  new pylint score: -7.86/10
---
 .../migrate_repo/versions/013_add_flavors_to_migrations.py         | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py b/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py
index 3fb92e85c..6e24c4517 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py
@@ -15,11 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.from sqlalchemy import *
 
-from sqlalchemy import *
-from migrate import *
-
-from nova import log as logging
-
+from sqlalchemy import MetaData, Column, Table, Integer
+#from nova import log as logging
 
 meta = MetaData()
 
-- 
cgit 


From 172ce9f39564eb4d416dae3ce7abafc46af8f695 Mon Sep 17 00:00:00 2001
From: Justin Shepherd <jshepher@rackspace.com>
Date: Tue, 10 May 2011 17:21:37 -0500
Subject: removed unused wild card imports, replaced sqlalchemy wildcard import
 with explicit imports

    previous pylint score: -63.75/10
    new pylint score: 2.67/10
---
 .../sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py b/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
index e87085668..317e8431d 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
@@ -13,15 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from migrate import *
-
-from nova import log as logging
-
-
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer
+from sqlalchemy import MetaData, String, Table
 meta = MetaData()
 
-
 # Table stub-definitions
 # Just for the ForeignKey and column creation to succeed, these are not the
 # actual definitions of instances or services.
-- 
cgit 


From bdc1225c97af653c6702743912f0b5ed251bcac3 Mon Sep 17 00:00:00 2001
From: Justin Shepherd <jshepher@rackspace.com>
Date: Tue, 10 May 2011 20:22:56 -0500
Subject: removed unused wild card imports, replaced sqlalchemy wildcard import
 with explicit imports

	previous pylint score: -55.00/10
	new pylint score: -1.76/10
---
 nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py b/nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py
index 23ccccb4e..1b0d08015 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py
@@ -16,10 +16,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from migrate import *
-from nova import log as logging
-from sqlalchemy import *
-
+from sqlalchemy import Boolean, Column, DateTime, Integer, MetaData
+from sqlalchemy import Table, Text
+# from nova import log as logging
 
 meta = MetaData()
 
-- 
cgit 


From 1f5313c5417d7417d20a75551d57156f90b6eb64 Mon Sep 17 00:00:00 2001
From: Justin Shepherd <jshepher@rackspace.com>
Date: Tue, 10 May 2011 22:22:45 -0500
Subject: removed unused wild card imports, replaced sqlalchemy wildcard import
 with explicit imports

---
 nova/db/sqlalchemy/migrate_repo/versions/001_austin.py           | 8 +++-----
 nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py            | 7 ++-----
 .../migrate_repo/versions/003_add_label_to_networks.py           | 8 ++------
 nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py  | 7 ++-----
 .../migrate_repo/versions/005_add_instance_metadata.py           | 7 ++-----
 .../migrate_repo/versions/006_add_provider_data_to_volumes.py    | 7 ++-----
 .../migrate_repo/versions/007_add_ipv6_to_fixed_ips.py           | 8 ++------
 .../sqlalchemy/migrate_repo/versions/008_add_instance_types.py   | 9 ++-------
 .../migrate_repo/versions/009_add_instance_migrations.py         | 6 ++----
 .../migrate_repo/versions/010_add_os_type_to_instances.py        | 8 ++------
 nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py   | 2 +-
 .../sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py | 2 ++
 .../migrate_repo/versions/013_add_flavors_to_migrations.py       | 4 ++--
 .../versions/014_add_instance_type_id_to_instances.py            | 2 +-
 .../migrate_repo/versions/015_add_auto_assign_to_floating_ips.py | 7 ++-----
 15 files changed, 29 insertions(+), 63 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py b/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py
index 9e7ab3554..63bbaccc1 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/001_austin.py
@@ -17,15 +17,13 @@
 #    under the License.
 
 ## Table code mostly autogenerated by genmodel.py
-from sqlalchemy import *
-from migrate import *
-
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey
+from sqlalchemy import ForeignKeyConstraint, Integer, MetaData, String
+from sqlalchemy import Table, Text
 from nova import log as logging
 
-
 meta = MetaData()
 
-
 auth_tokens = Table('auth_tokens', meta,
         Column('created_at', DateTime(timezone=False)),
         Column('updated_at', DateTime(timezone=False)),
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py b/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py
index 413536a59..9bb8a8ada 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/002_bexar.py
@@ -16,15 +16,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from migrate import *
-
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey
+from sqlalchemy import Integer, MetaData, String, Table, Text
 from nova import log as logging
 
-
 meta = MetaData()
 
-
 # Just for the ForeignKey and column creation to succeed, these are not the
 # actual definitions of instances or services.
 instances = Table('instances', meta,
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/003_add_label_to_networks.py b/nova/db/sqlalchemy/migrate_repo/versions/003_add_label_to_networks.py
index 5ba7910f1..4a6fd7599 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/003_add_label_to_networks.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/003_add_label_to_networks.py
@@ -15,15 +15,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from migrate import *
-
-from nova import log as logging
-
+from sqlalchemy import Column, Integer, MetaData, String, Table
+# from nova import log as logging
 
 meta = MetaData()
 
-
 networks = Table('networks', meta,
         Column('id', Integer(),  primary_key=True, nullable=False),
         )
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py b/nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py
index ade981687..0abea374c 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/004_add_zone_tables.py
@@ -13,15 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from migrate import *
-
+from sqlalchemy import Boolean, Column, DateTime, Integer
+from sqlalchemy import MetaData, String, Table
 from nova import log as logging
 
-
 meta = MetaData()
 
-
 #
 # New Tables
 #
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/005_add_instance_metadata.py b/nova/db/sqlalchemy/migrate_repo/versions/005_add_instance_metadata.py
index 4cb07e0d8..a1a86e3b4 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/005_add_instance_metadata.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/005_add_instance_metadata.py
@@ -15,15 +15,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from migrate import *
-
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer
+from sqlalchemy import MetaData, String, Table
 from nova import log as logging
 
-
 meta = MetaData()
 
-
 # Just for the ForeignKey and column creation to succeed, these are not the
 # actual definitions of instances or services.
 instances = Table('instances', meta,
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/006_add_provider_data_to_volumes.py b/nova/db/sqlalchemy/migrate_repo/versions/006_add_provider_data_to_volumes.py
index 705fc8ff3..81a924d42 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/006_add_provider_data_to_volumes.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/006_add_provider_data_to_volumes.py
@@ -15,11 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from migrate import *
-
-from nova import log as logging
-
+from sqlalchemy import Column, Integer, MetaData, String, Table
+# from nova import log as logging
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py b/nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py
index 427934d53..56b43ae48 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py
@@ -13,15 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from migrate import *
-
-from nova import log as logging
-
+from sqlalchemy import Column, Integer, MetaData, String, Table
+# from nova import log as logging
 
 meta = MetaData()
 
-
 # Table stub-definitions
 # Just for the ForeignKey and column creation to succeed, these are not the
 # actual definitions of instances or services.
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py b/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py
index 5e2cb69d9..63999f6ff 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/008_add_instance_types.py
@@ -13,15 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from migrate import *
-
-from nova import api
-from nova import db
+from sqlalchemy import Boolean, Column, DateTime, Integer
+from sqlalchemy import MetaData, String, Table
 from nova import log as logging
 
-import datetime
-
 meta = MetaData()
 
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/009_add_instance_migrations.py b/nova/db/sqlalchemy/migrate_repo/versions/009_add_instance_migrations.py
index 4fda525f1..0f2d0079a 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/009_add_instance_migrations.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/009_add_instance_migrations.py
@@ -15,12 +15,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.from sqlalchemy import *
 
-from sqlalchemy import *
-from migrate import *
-
+from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer
+from sqlalchemy import MetaData, String, Table
 from nova import log as logging
 
-
 meta = MetaData()
 
 # Just for the ForeignKey and column creation to succeed, these are not the
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py
index eb3066894..0f7ee92e6 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py
@@ -14,12 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from sqlalchemy.sql import text
-from migrate import *
-
-from nova import log as logging
-
+from sqlalchemy import Column, Integer, MetaData, String, Table
+# from nova import log as logging
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py b/nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py
index 1b0d08015..b2b0256d2 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/011_live_migration.py
@@ -18,7 +18,7 @@
 
 from sqlalchemy import Boolean, Column, DateTime, Integer, MetaData
 from sqlalchemy import Table, Text
-# from nova import log as logging
+from nova import log as logging
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py b/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
index 317e8431d..294d3e698 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
@@ -15,6 +15,8 @@
 
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer
 from sqlalchemy import MetaData, String, Table
+# from nova import log as loggingo
+
 meta = MetaData()
 
 # Table stub-definitions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py b/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py
index 6e24c4517..77015f58f 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py
@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.from sqlalchemy import *
 
-from sqlalchemy import MetaData, Column, Table, Integer
-#from nova import log as logging
+from sqlalchemy import Column, Integer, MetaData, Table
+# from nova import log as logging
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py
index bb4a9619c..62216be12 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/014_add_instance_type_id_to_instances.py
@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import MetaData, Column, String, Table, Integer
+from sqlalchemy import Column, Integer, MetaData, String, Table
 #from nova import log as logging
 
 meta = MetaData()
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py b/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py
index 29b26b3dd..5b2950f32 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py
@@ -15,14 +15,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import *
-from sqlalchemy.sql import text
-from migrate import *
-
+from sqlalchemy import Boolean, Column, MetaData, Table
+# from nova import log as loggingo
 
 meta = MetaData()
 
-
 c_auto_assigned = Column('auto_assigned', Boolean, default=False)
 
 
-- 
cgit 


From b3c07b0473fc1d1de805f7a538189b99873aaab3 Mon Sep 17 00:00:00 2001
From: Justin Shepherd <jshepher@rackspace.com>
Date: Wed, 11 May 2011 12:33:44 -0500
Subject: Removed commented out 'from nova import log as logging' line, per
 request from Brian Lamar

---
 nova/db/sqlalchemy/migrate_repo/versions/003_add_label_to_networks.py    | 1 -
 .../sqlalchemy/migrate_repo/versions/006_add_provider_data_to_volumes.py | 1 -
 nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py    | 1 -
 nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py | 1 -
 nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py     | 1 -
 .../db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py | 1 -
 .../migrate_repo/versions/015_add_auto_assign_to_floating_ips.py         | 1 -
 7 files changed, 7 deletions(-)

(limited to 'nova/db')

diff --git a/nova/db/sqlalchemy/migrate_repo/versions/003_add_label_to_networks.py b/nova/db/sqlalchemy/migrate_repo/versions/003_add_label_to_networks.py
index 4a6fd7599..8e0de4d2b 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/003_add_label_to_networks.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/003_add_label_to_networks.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from sqlalchemy import Column, Integer, MetaData, String, Table
-# from nova import log as logging
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/006_add_provider_data_to_volumes.py b/nova/db/sqlalchemy/migrate_repo/versions/006_add_provider_data_to_volumes.py
index 81a924d42..4627d3332 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/006_add_provider_data_to_volumes.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/006_add_provider_data_to_volumes.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from sqlalchemy import Column, Integer, MetaData, String, Table
-# from nova import log as logging
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py b/nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py
index 56b43ae48..6f2668040 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/007_add_ipv6_to_fixed_ips.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 from sqlalchemy import Column, Integer, MetaData, String, Table
-# from nova import log as logging
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py b/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py
index 0f7ee92e6..a5b80586e 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/010_add_os_type_to_instances.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 from sqlalchemy import Column, Integer, MetaData, String, Table
-# from nova import log as logging
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py b/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
index 294d3e698..10d250522 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/012_add_ipv6_flatmanager.py
@@ -15,7 +15,6 @@
 
 from sqlalchemy import Boolean, Column, DateTime, ForeignKey, Integer
 from sqlalchemy import MetaData, String, Table
-# from nova import log as loggingo
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py b/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py
index 77015f58f..7246839b7 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/013_add_flavors_to_migrations.py
@@ -16,7 +16,6 @@
 #    under the License.from sqlalchemy import *
 
 from sqlalchemy import Column, Integer, MetaData, Table
-# from nova import log as logging
 
 meta = MetaData()
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py b/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py
index 5b2950f32..375760c84 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/015_add_auto_assign_to_floating_ips.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from sqlalchemy import Boolean, Column, MetaData, Table
-# from nova import log as loggingo
 
 meta = MetaData()
 
-- 
cgit