From 4f03b3faf990556a695534fb0e0cc95414a12080 Mon Sep 17 00:00:00 2001 From: Martin Zimmermann Date: Thu, 19 Sep 2013 18:34:02 +0200 Subject: [PATCH] re-license to MIT --- LICENSE | 21 +++++++++++++++++++++ isso/__init__.py | 29 +++++++++++++++++------------ isso/migrate.py | 3 --- isso/notify.py | 1 + isso/utils.py | 3 --- isso/views/admin.py | 3 --- isso/views/comment.py | 3 --- isso/wsgi.py | 1 + 8 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1045e5b --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2012-2013 Martin Zimmermann. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/isso/__init__.py b/isso/__init__.py index 42a2aab..853187c 100644 --- a/isso/__init__.py +++ b/isso/__init__.py @@ -1,22 +1,27 @@ #!/usr/bin/env python # -*- encoding: utf-8 -*- # -# Copyright 2012, Martin Zimmermann . -# All rights reserved. +# The MIT License (MIT) # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: +# Copyright (c) 2012-2013 Martin Zimmermann. # -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: # -# 2. 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. +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. # -# The views and conclusions contained in the software and documentation are -# those of the authors and should not be interpreted as representing official -# policies, either expressed or implied, of Martin Zimmermann . +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +# THE SOFTWARE. # # Isso – a lightweight Disqus alternative diff --git a/isso/migrate.py b/isso/migrate.py index 5ffe726..94703ec 100644 --- a/isso/migrate.py +++ b/isso/migrate.py @@ -1,8 +1,5 @@ # -*- encoding: utf-8 -*- # -# Copyright 2012, Martin Zimmermann . All rights reserved. -# License: BSD Style, 2 clauses. see isso/__init__.py -# # TODO # # - export does not include website from commenters diff --git a/isso/notify.py b/isso/notify.py index f89e071..1d97774 100644 --- a/isso/notify.py +++ b/isso/notify.py @@ -1,3 +1,4 @@ +# -*- encoding: utf-8 -*- import time import logging diff --git a/isso/utils.py b/isso/utils.py index 6b7bca3..a571b46 100644 --- a/isso/utils.py +++ b/isso/utils.py @@ -1,7 +1,4 @@ # -*- encoding: utf-8 -*- -# -# Copyright 2012, Martin Zimmermann . All rights reserved. -# License: BSD Style, 2 clauses. see isso/__init__.py from __future__ import division diff --git a/isso/views/admin.py b/isso/views/admin.py index e27d67c..348b60a 100644 --- a/isso/views/admin.py +++ b/isso/views/admin.py @@ -1,7 +1,4 @@ # -*- encoding: utf-8 -*- -# -# Copyright 2012, Martin Zimmermann . All rights reserved. -# License: BSD Style, 2 clauses. see isso/__init__.py from os.path import join, dirname diff --git a/isso/views/comment.py b/isso/views/comment.py index 71e16e6..0edfaa0 100644 --- a/isso/views/comment.py +++ b/isso/views/comment.py @@ -1,7 +1,4 @@ # -*- encoding: utf-8 -*- -# -# Copyright 2012, Martin Zimmermann . All rights reserved. -# License: BSD Style, 2 clauses. see isso/__init__.py import cgi import json diff --git a/isso/wsgi.py b/isso/wsgi.py index b31f136..b2cbf95 100644 --- a/isso/wsgi.py +++ b/isso/wsgi.py @@ -1,3 +1,4 @@ +# -*- encoding: utf-8 -*- class SubURI(object):