Moved from Python Software Foundation License to BSD License.

I didn't know what header to include in the code for the PSFL.

diff --git a/FFT_tools.py b/FFT_tools.py
index 7174d1de5ac6d06ce48c1668dd26f8929ce42976..b79d3b44922df92dd084318189df0499bb7d25aa 100644 (file)
--- a/FFT_tools.py
+++ b/FFT_tools.py
@@ -1,4 +1,38 @@
 #!/usr/bin/python
+#
+# Wrap Numpy's fft module to produce 1D unitary transforms and power spectra.
+#
+# Copyright (C) 2008  W. Trevor King
+# All rights reserved.
+#
+# 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 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.
+#
+#  * Neither the name of the copyright holders nor the names of the
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+# 
+# 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. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
 
 """
 Define some FFT wrappers to reduce clutter.

diff --git a/setup.py b/setup.py
index e0e12b80530eef062d97294a30f983f8d82dd787..989bfa3d8451a0f3585fcefa145bfc91ec32d4d5 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ Intended Audience :: Developers
 Intended Audience :: Science/Research
 Operating System :: POSIX
 Operating System :: Unix
-License :: OSI Approved :: Python Software Foundation License
+License :: OSI Approved :: BSD License
 Programming Language :: Python
 Topic :: Scientific/Engineering
 Topic :: Software Development :: Libraries :: Python Modules
@@ -40,7 +40,7 @@ setup(name="FFT_tools",
       maintainer_email="wking@drexel.edu",
       url = "http://www.physics.drexel.edu/~wking/code/python/",
       download_url = "http://www.physics.drexel.edu/~wking/code/python/FFT_tools-0.1.tar.gz",
-      license = "http://www.python.org/psf/license/",
+      license = "BSD",
       platforms = ["all"],
       description = doclines[0],
       long_description = "\n".join(doclines[2:]),