From 737fff67c3ed8135329aeddd9b0e0dde186d0e57 Mon Sep 17 00:00:00 2001 From: Clint Byrum Date: Fri, 19 Jul 2013 10:24:24 -0700 Subject: [PATCH] Fixes for hacking 0.6 - Add missing License Header to exc. - Use python 3 compatible print. Change-Id: Ibbcbfadffb978f9d8789e1fbc0c0819da06489d3 --- os_collect_config/collect.py | 2 +- os_collect_config/exc.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/os_collect_config/collect.py b/os_collect_config/collect.py index 937177a..8e57fa2 100644 --- a/os_collect_config/collect.py +++ b/os_collect_config/collect.py @@ -129,7 +129,7 @@ def __main__(args=sys.argv, requests_impl_map=None): else: logger.debug("No changes detected.") else: - print json.dumps(content, indent=1) + print(json.dumps(content, indent=1)) if __name__ == '__main__': diff --git a/os_collect_config/exc.py b/os_collect_config/exc.py index be2a633..481351c 100644 --- a/os_collect_config/exc.py +++ b/os_collect_config/exc.py @@ -1,3 +1,19 @@ +# Copyright (c) 2013 Hewlett-Packard Development Company, L.P. +# +# 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. + + class SourceNotAvailable(RuntimeError): """The requested data source is unavailable."""