From 8ef33015c607d0356a2fca47f39028384dd366af Mon Sep 17 00:00:00 2001 From: Thierry Carrez Date: Thu, 20 Feb 2014 11:56:37 +0100 Subject: [PATCH] Trivial changes from oslo-incubator A number of trivial changes were merged to the oslo-incubator copy of the rootwrap code while the code was being graduated. Those changes should have been rejected (as the code was frozen while in graduation) and applied to oslo.rootwrap instead. Now that the oslo-incubator copy of the code was removed, we should reapply those trivial changes to oslo.rootwrap instead, otherwise they will just be lost: * Remove vim header (original author: jogo) * Make vertical white space after license header consistent (noorul) * Removed copyright from empty files (jay-lau) Change-Id: I0403335b8ec151e2337d50935be18355cc55a199 --- oslo/rootwrap/__init__.py | 16 ---------------- oslo/rootwrap/cmd.py | 2 -- oslo/rootwrap/filters.py | 2 -- oslo/rootwrap/wrapper.py | 3 --- tests/__init__.py | 15 --------------- tests/test_rootwrap.py | 2 -- 6 files changed, 40 deletions(-) diff --git a/oslo/rootwrap/__init__.py b/oslo/rootwrap/__init__.py index 2d32e4e..e69de29 100644 --- a/oslo/rootwrap/__init__.py +++ b/oslo/rootwrap/__init__.py @@ -1,16 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright (c) 2011 OpenStack Foundation. -# 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. diff --git a/oslo/rootwrap/cmd.py b/oslo/rootwrap/cmd.py index 34ffe9a..7d6fbed 100644 --- a/oslo/rootwrap/cmd.py +++ b/oslo/rootwrap/cmd.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation. # All Rights Reserved. # diff --git a/oslo/rootwrap/filters.py b/oslo/rootwrap/filters.py index 788cbde..ec8b6dd 100644 --- a/oslo/rootwrap/filters.py +++ b/oslo/rootwrap/filters.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation. # All Rights Reserved. # diff --git a/oslo/rootwrap/wrapper.py b/oslo/rootwrap/wrapper.py index 428d305..e19723d 100644 --- a/oslo/rootwrap/wrapper.py +++ b/oslo/rootwrap/wrapper.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright (c) 2011 OpenStack Foundation. # All Rights Reserved. # @@ -15,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. - import logging import logging.handlers import os diff --git a/tests/__init__.py b/tests/__init__.py index cae279d..e69de29 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,15 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright 2013 OpenStack Foundation -# -# 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. diff --git a/tests/test_rootwrap.py b/tests/test_rootwrap.py index f25a56f..88de79a 100644 --- a/tests/test_rootwrap.py +++ b/tests/test_rootwrap.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2011 OpenStack Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); you may