From ef9bc2887060c051e7fd7140bd646cd56842c836 Mon Sep 17 00:00:00 2001 From: Rob Cresswell Date: Mon, 16 Nov 2015 11:35:41 +0000 Subject: [PATCH] Remove legacy models.py files There are a number of models.py files lying around. This is legacy (see https://code.djangoproject.com/ticket/7198). This patch removes those files. Closes-Bug: 1516589 Change-Id: I84868107cad3a037079b24403ce1f5a8789de654 --- horizon/conf/dash_template/models.py | 15 ------------- horizon/models.py | 21 ------------------- .../test_dashboards/cats/kittens/models.py | 3 --- horizon/test/test_dashboards/cats/models.py | 3 --- .../test_dashboards/cats/tigers/models.py | 3 --- horizon/test/test_dashboards/dogs/models.py | 3 --- .../test_dashboards/dogs/puppies/models.py | 3 --- .../dashboards/admin/models.py | 21 ------------------- .../project/loadbalancers/models.py | 3 --- .../dashboards/project/models.py | 21 ------------------- .../dashboards/settings/models.py | 21 ------------------- 11 files changed, 117 deletions(-) delete mode 100644 horizon/conf/dash_template/models.py delete mode 100644 horizon/models.py delete mode 100644 horizon/test/test_dashboards/cats/kittens/models.py delete mode 100644 horizon/test/test_dashboards/cats/models.py delete mode 100644 horizon/test/test_dashboards/cats/tigers/models.py delete mode 100644 horizon/test/test_dashboards/dogs/models.py delete mode 100644 horizon/test/test_dashboards/dogs/puppies/models.py delete mode 100644 openstack_dashboard/dashboards/admin/models.py delete mode 100644 openstack_dashboard/dashboards/project/loadbalancers/models.py delete mode 100644 openstack_dashboard/dashboards/project/models.py delete mode 100644 openstack_dashboard/dashboards/settings/models.py diff --git a/horizon/conf/dash_template/models.py b/horizon/conf/dash_template/models.py deleted file mode 100644 index 428ef07c29..0000000000 --- a/horizon/conf/dash_template/models.py +++ /dev/null @@ -1,15 +0,0 @@ -# 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. - -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/horizon/models.py b/horizon/models.py deleted file mode 100644 index 63e0b0f00b..0000000000 --- a/horizon/models.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2012 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2012 Nebula, Inc. -# -# 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. - -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/horizon/test/test_dashboards/cats/kittens/models.py b/horizon/test/test_dashboards/cats/kittens/models.py deleted file mode 100644 index 1b3d5f9efc..0000000000 --- a/horizon/test/test_dashboards/cats/kittens/models.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/horizon/test/test_dashboards/cats/models.py b/horizon/test/test_dashboards/cats/models.py deleted file mode 100644 index 1b3d5f9efc..0000000000 --- a/horizon/test/test_dashboards/cats/models.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/horizon/test/test_dashboards/cats/tigers/models.py b/horizon/test/test_dashboards/cats/tigers/models.py deleted file mode 100644 index 1b3d5f9efc..0000000000 --- a/horizon/test/test_dashboards/cats/tigers/models.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/horizon/test/test_dashboards/dogs/models.py b/horizon/test/test_dashboards/dogs/models.py deleted file mode 100644 index 1b3d5f9efc..0000000000 --- a/horizon/test/test_dashboards/dogs/models.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/horizon/test/test_dashboards/dogs/puppies/models.py b/horizon/test/test_dashboards/dogs/puppies/models.py deleted file mode 100644 index 1b3d5f9efc..0000000000 --- a/horizon/test/test_dashboards/dogs/puppies/models.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/openstack_dashboard/dashboards/admin/models.py b/openstack_dashboard/dashboards/admin/models.py deleted file mode 100644 index 63e0b0f00b..0000000000 --- a/openstack_dashboard/dashboards/admin/models.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2012 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2012 Nebula, Inc. -# -# 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. - -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/openstack_dashboard/dashboards/project/loadbalancers/models.py b/openstack_dashboard/dashboards/project/loadbalancers/models.py deleted file mode 100644 index 1b3d5f9efc..0000000000 --- a/openstack_dashboard/dashboards/project/loadbalancers/models.py +++ /dev/null @@ -1,3 +0,0 @@ -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/openstack_dashboard/dashboards/project/models.py b/openstack_dashboard/dashboards/project/models.py deleted file mode 100644 index 63e0b0f00b..0000000000 --- a/openstack_dashboard/dashboards/project/models.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2012 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2012 Nebula, Inc. -# -# 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. - -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -""" diff --git a/openstack_dashboard/dashboards/settings/models.py b/openstack_dashboard/dashboards/settings/models.py deleted file mode 100644 index 63e0b0f00b..0000000000 --- a/openstack_dashboard/dashboards/settings/models.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2012 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# All Rights Reserved. -# -# Copyright 2012 Nebula, Inc. -# -# 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. - -""" -Stub file to work around django bug: https://code.djangoproject.com/ticket/7198 -"""