Permalink
Browse files

Change license author back to original and add myself as maintainer i…

…n setup.py
  • Loading branch information...
1 parent a20e114 commit 19978b1649c4e502ab0351c7358550f7f22d122f @mattupstate committed Jun 20, 2012
Showing with 25 additions and 21 deletions.
  1. +19 −17 LICENSE
  2. +1 −1 flask_principal/__init__.py
  3. +1 −1 flask_principal/backport.py
  4. +4 −2 setup.py
View
36 LICENSE
@@ -1,20 +1,22 @@
-MIT License
+Copyright (c) 2012 Ali Afshar
-Copyright (C) 2012 by Matt Wright
+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:
-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 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.
+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.
View
2 flask_principal/__init__.py
@@ -5,7 +5,7 @@
Identity management for Flask.
- :copyright: (c) 2012 by Matt Wright.
+ :copyright: (c) 2012 by Ali Afshar.
:license: MIT, see LICENSE for more details.
"""
View
2 flask_principal/backport.py
@@ -5,7 +5,7 @@
Backport module for Flask-Principal.
- :copyright: (c) 2012 by Matt Wright.
+ :copyright: (c) 2012 by Ali Afshar.
:license: MIT, see LICENSE for more details.
"""
View
6 setup.py
@@ -19,8 +19,10 @@
version='0.3',
url='http://packages.python.org/Flask-Principal/',
license='MIT',
- author='Matt Wright',
- author_email='matt@nobien.net',
+ author='Ali Afshar',
+ author_email='aafshar@gmail.com',
+ maintainer='Matt Wright',
+ maintainer_email='matt@nobien.net',
description='Identity management for flask',
long_description=__doc__,
packages=['flask_principal'],

0 comments on commit 19978b1

Please sign in to comment.