From 870b4efb44ab3869739fa1cdec9e1b4fdd6be37f Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Tue, 29 Jul 2014 18:05:32 -0500 Subject: clean up license headers This removes extraneous whitespace, applies a consistent licensing header to all files, removes "all rights reserved" lines attributed to the OpenStack Foundation, removes authorship lines for Matt Rutkowski (which the git commit history much more accurately conveys) and follows all licenses with a blank line before the code/docstr begins. Change-Id: Idcfefd923e5ddb574087265c998dd50ebfe70a79 --- pycadf/attachment.py | 15 ++++++--------- pycadf/audit/api.py | 14 ++++++-------- pycadf/cadftaxonomy.py | 15 ++++++--------- pycadf/cadftype.py | 15 ++++++--------- pycadf/credential.py | 13 ++++++------- pycadf/endpoint.py | 13 ++++++------- pycadf/event.py | 15 ++++++--------- pycadf/eventfactory.py | 15 ++++++--------- pycadf/geolocation.py | 15 ++++++--------- pycadf/host.py | 13 ++++++------- pycadf/identifier.py | 15 ++++++--------- pycadf/measurement.py | 15 ++++++--------- pycadf/metric.py | 15 ++++++--------- pycadf/middleware/audit.py | 19 +++++++++---------- pycadf/middleware/base.py | 19 +++++++++---------- pycadf/middleware/notifier.py | 25 ++++++++++++------------- pycadf/path.py | 15 ++++++--------- pycadf/reason.py | 15 ++++++--------- pycadf/reporterstep.py | 15 ++++++--------- pycadf/resource.py | 15 ++++++--------- pycadf/tag.py | 15 ++++++--------- pycadf/tests/audit/test_api.py | 15 +++++++-------- pycadf/tests/base.py | 17 ++++++++--------- pycadf/tests/middleware/test_audit.py | 21 ++++++++++----------- pycadf/tests/test_cadf_spec.py | 15 +++++++-------- pycadf/tests/test_utils.py | 15 +++++++-------- pycadf/timestamp.py | 15 ++++++--------- pycadf/utils.py | 14 +++++++------- 28 files changed, 190 insertions(+), 248 deletions(-) diff --git a/pycadf/attachment.py b/pycadf/attachment.py index ca83934..1fea386 100644 --- a/pycadf/attachment.py +++ b/pycadf/attachment.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/audit/api.py b/pycadf/audit/api.py index 411e1a9..933579b 100644 --- a/pycadf/audit/api.py +++ b/pycadf/audit/api.py @@ -1,18 +1,16 @@ -# # Copyright 2013 IBM Corp. # +# 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 # -# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import ast import collections diff --git a/pycadf/cadftaxonomy.py b/pycadf/cadftaxonomy.py index bf7c541..12fd621 100644 --- a/pycadf/cadftaxonomy.py +++ b/pycadf/cadftaxonomy.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. from pycadf import cadftype diff --git a/pycadf/cadftype.py b/pycadf/cadftype.py index 4c04333..68f89b2 100644 --- a/pycadf/cadftype.py +++ b/pycadf/cadftype.py @@ -1,19 +1,16 @@ -# # Copyright (c) 2013 IBM Corporation # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import abc diff --git a/pycadf/credential.py b/pycadf/credential.py index 09715ef..e6e045d 100644 --- a/pycadf/credential.py +++ b/pycadf/credential.py @@ -1,17 +1,16 @@ -# # Copyright (c) 2013 IBM Corporation # -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/endpoint.py b/pycadf/endpoint.py index a769b11..cc04bfe 100644 --- a/pycadf/endpoint.py +++ b/pycadf/endpoint.py @@ -1,17 +1,16 @@ -# # Copyright (c) 2013 IBM Corporation # -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/event.py b/pycadf/event.py index 8bd4f69..384fa40 100644 --- a/pycadf/event.py +++ b/pycadf/event.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/eventfactory.py b/pycadf/eventfactory.py index fa079d0..29d55cb 100644 --- a/pycadf/eventfactory.py +++ b/pycadf/eventfactory.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. from pycadf import cadftype from pycadf import event diff --git a/pycadf/geolocation.py b/pycadf/geolocation.py index fcbaee9..af95966 100644 --- a/pycadf/geolocation.py +++ b/pycadf/geolocation.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/host.py b/pycadf/host.py index f55cdcb..8cccd86 100644 --- a/pycadf/host.py +++ b/pycadf/host.py @@ -1,17 +1,16 @@ -# # Copyright (c) 2013 IBM Corporation # -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/identifier.py b/pycadf/identifier.py index f25d88c..ddca6b4 100644 --- a/pycadf/identifier.py +++ b/pycadf/identifier.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import uuid diff --git a/pycadf/measurement.py b/pycadf/measurement.py index cb6c577..85f0c8e 100644 --- a/pycadf/measurement.py +++ b/pycadf/measurement.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. from pycadf import cadftype from pycadf import identifier diff --git a/pycadf/metric.py b/pycadf/metric.py index e0f5fa5..55f2185 100644 --- a/pycadf/metric.py +++ b/pycadf/metric.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/middleware/audit.py b/pycadf/middleware/audit.py index 6234b0a..bc0657b 100644 --- a/pycadf/middleware/audit.py +++ b/pycadf/middleware/audit.py @@ -1,17 +1,16 @@ # Copyright (c) 2013 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 +# 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 +# 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. +# 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. """ Attach open standard audit information to request.environ diff --git a/pycadf/middleware/base.py b/pycadf/middleware/base.py index 464a1cc..f627011 100644 --- a/pycadf/middleware/base.py +++ b/pycadf/middleware/base.py @@ -1,17 +1,16 @@ # Copyright 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 +# 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 +# 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. +# 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. """Base class(es) for WSGI Middleware.""" diff --git a/pycadf/middleware/notifier.py b/pycadf/middleware/notifier.py index 621c8b4..d330562 100644 --- a/pycadf/middleware/notifier.py +++ b/pycadf/middleware/notifier.py @@ -1,20 +1,19 @@ # Copyright (c) 2013 eNovance # -# 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 +# 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 +# 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. - -""" -Send notifications on request -""" +# 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. + +"""Send notifications on request""" + import os.path import sys import traceback as tb diff --git a/pycadf/path.py b/pycadf/path.py index 7d605c9..f8e5b70 100644 --- a/pycadf/path.py +++ b/pycadf/path.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/reason.py b/pycadf/reason.py index 260750a..a6b5ff3 100644 --- a/pycadf/reason.py +++ b/pycadf/reason.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/reporterstep.py b/pycadf/reporterstep.py index 232cf2e..b8f91c0 100644 --- a/pycadf/reporterstep.py +++ b/pycadf/reporterstep.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. from pycadf import cadftype from pycadf import identifier diff --git a/pycadf/resource.py b/pycadf/resource.py index 4e91240..96d9aa8 100644 --- a/pycadf/resource.py +++ b/pycadf/resource.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/tag.py b/pycadf/tag.py index ef7c671..43a5b4d 100644 --- a/pycadf/tag.py +++ b/pycadf/tag.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import six diff --git a/pycadf/tests/audit/test_api.py b/pycadf/tests/audit/test_api.py index c578257..e434253 100644 --- a/pycadf/tests/audit/test_api.py +++ b/pycadf/tests/audit/test_api.py @@ -1,18 +1,17 @@ -# # Copyright 2013 IBM Corp. # +# 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 # -# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. + import uuid from oslo.config import cfg diff --git a/pycadf/tests/base.py b/pycadf/tests/base.py index 2f4f68b..f6b4400 100644 --- a/pycadf/tests/base.py +++ b/pycadf/tests/base.py @@ -1,20 +1,19 @@ -# # Copyright 2013 IBM Corp. # -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. + +"""Test base classes.""" -"""Test base classes. -""" import os.path import fixtures diff --git a/pycadf/tests/middleware/test_audit.py b/pycadf/tests/middleware/test_audit.py index b9770be..389f80d 100644 --- a/pycadf/tests/middleware/test_audit.py +++ b/pycadf/tests/middleware/test_audit.py @@ -1,17 +1,16 @@ -# Copyright (c) 2014 OpenStack Foundation -# All Rights Reserved. +# Copyright (c) 2014 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 +# 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 +# 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. +# 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 mock import webob diff --git a/pycadf/tests/test_cadf_spec.py b/pycadf/tests/test_cadf_spec.py index fdbd60c..68761a4 100644 --- a/pycadf/tests/test_cadf_spec.py +++ b/pycadf/tests/test_cadf_spec.py @@ -1,18 +1,17 @@ -# # Copyright 2013 OpenStack LLC -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. + import time from pycadf import attachment diff --git a/pycadf/tests/test_utils.py b/pycadf/tests/test_utils.py index 8eaa22a..8508bec 100644 --- a/pycadf/tests/test_utils.py +++ b/pycadf/tests/test_utils.py @@ -1,18 +1,17 @@ -# # Copyright 2013 OpenStack LLC -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. + import uuid from pycadf.tests import base diff --git a/pycadf/timestamp.py b/pycadf/timestamp.py index 60c492b..3566f9e 100644 --- a/pycadf/timestamp.py +++ b/pycadf/timestamp.py @@ -1,19 +1,16 @@ -# # Copyright 2013 IBM Corp. # -# Author: Matt Rutkowski -# -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. import datetime diff --git a/pycadf/utils.py b/pycadf/utils.py index 2cbaed2..3275ae0 100644 --- a/pycadf/utils.py +++ b/pycadf/utils.py @@ -1,17 +1,17 @@ -# # Copyright 2013 IBM Corp. # -# 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 +# 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 +# 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. +# License for the specific language governing permissions and limitations under +# the License. + import six -- cgit v1.2.1