Licence updates

[ci skip]
sunpy · Dec 23, 2014 · f467832 · f467832
1 parent 54b6dc8
commit f467832
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/licenses/ASTROPY.txt → licenses/ASTROPY.rst b/licenses/ASTROPY.txt → licenses/ASTROPY.rst
diff --git a/licenses/FUNCSIGS.txt → licenses/FUNCSIGS.rst b/licenses/FUNCSIGS.txt → licenses/FUNCSIGS.rst
diff --git a/licenses/SUNPY.txt → licenses/SUNPY.rst b/licenses/SUNPY.txt → licenses/SUNPY.rst
@@ -3,15 +3,15 @@ SunPy is released under a BSD-style open source licence:
 Copyright (c) 2013 The SunPy developers
 All rights reserved.
 
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
+* Redistribution and use in source and binary forms, with or without modification,
+  are permitted provided that the following conditions are met:
 
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
 
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
 INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 

diff --git a/sunpy/util/compat/_funcsigs.py b/sunpy/util/compat/_funcsigs.py
@@ -1,6 +1,6 @@
 # Copyright 2001-2013 Python Software Foundation; All Rights Reserved
 # https://github.com/aliles/funcsigs - Licenced under the Apache 2.0
-# Licence - see: licences/FUNCSIGS.txt
+# Licence - see: licences/FUNCSIGS.rst
 """Function signature objects for callables
 
 Back port of Python 3.3's function signature tools from the inspect module,

diff --git a/sunpy/util/tests/test_quantity_decorator.py b/sunpy/util/tests/test_quantity_decorator.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Lovingly borrowed from Astropy 
-# Licensed under a 3-clause BSD style license - see LICENSE.rst
+# Lovingly borrowed from Astropy
+# Licensed under a 3-clause BSD style license - see licences/ASTROPY.rst
 
 from astropy import units as u
 from sunpy.util import quantity_input
@@ -162,4 +162,4 @@ def myfunc_args(solarx):
     with pytest.raises(TypeError) as e:
         solarx, solary = myfunc_args(test_quantity())
 
-        assert str(e.value) == "Argument 'solarx' to function has 'myfunc_args' a 'unit' attribute without an 'is_equivalent' method. You may want to pass in an astropy Quantity instead."
+        assert str(e.value) == "Argument 'solarx' to function has 'myfunc_args' a 'unit' attribute without an 'is_equivalent' method. You may want to pass in an astropy Quantity instead."
diff --git a/sunpy/util/unit_decorators.py b/sunpy/util/unit_decorators.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Lovingly borrowed from Astropy
-# Licensed under a 3-clause BSD style license - see licences/ASTROPY.txt
+# Licensed under a 3-clause BSD style license - see licences/ASTROPY.rst
 
 __all__ = ['quantity_input']