Reverted extension loading tweaks

2 files changed, 1 insertions, 20 deletions

diff --git a/nova/tests/api/openstack/extensions/foxinsocks/foxinsocks.py b/nova/tests/api/openstack/extensions/foxinsocks.py
index 442707714..0860b51ac 100644
--- a/nova/tests/api/openstack/extensions/foxinsocks/foxinsocks.py
+++ b/nova/tests/api/openstack/extensions/foxinsocks.py
@@ -28,7 +28,7 @@ class FoxInSocksController(wsgi.Controller):
         return "Try to say this Mr. Knox, sir..."
 
 
-class Foxinsocks(extensions.ExtensionDescriptor):
+class Foxinsocks(object):
 
     def __init__(self):
         pass
diff --git a/nova/tests/api/openstack/extensions/foxinsocks/__init__.py b/nova/tests/api/openstack/extensions/foxinsocks/__init__.py
deleted file mode 100644
index fe505359d..000000000
--- a/nova/tests/api/openstack/extensions/foxinsocks/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2011 OpenStack LLC.
-# Copyright 2011 Justin Santa Barbara
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.import datetime
-
-"""Example Fox-in-Socks extension."""