From ff764bda4927babc46cde140eb5b8a831b0f1249 Mon Sep 17 00:00:00 2001 From: BJ Dierkes Date: Tue, 26 Jan 2010 18:50:57 -0600 Subject: [PATCH] MIT License --- ChangeLog | 1 + LICENSE | 63 +++++++++++---------------------------- README | 18 +++++------ cement/core/controller.py | 2 -- setup.py | 20 ++++++------- 5 files changed, 37 insertions(+), 67 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f064ed8..d397d465 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ New Features: + + Moving to the MIT License. + Reworked cement to provide a proper model, view, controller interface very similar to the layout of TurboGears2. + Added Genshi text templating support. diff --git a/LICENSE b/LICENSE index a0fc3f67..9db4e4d3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,50 +1,21 @@ -PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 --------------------------------------------- +The MIT License: -1. This LICENSE AGREEMENT is between William J. Dierkes (a.k.a "BJ Dierkes"), -and the Individual or Organization ("Licensee") accessing and otherwise using -this software ("Cement CLI Application Framework for Python") in source or -binary form and its associated documentation. +Copyright (c) 2009 BJ Dierkes -2. Subject to the terms and conditions of this License Agreement, BJ Dierkes -hereby grants Licensee a nonexclusive, royalty-free, world-wide -license to reproduce, analyze, test, perform and/or display publicly, -prepare derivative works, distribute, and otherwise use Cement CLI Application -Framework for Python alone or in any derivative version, provided, however, -that BJ Dierkes' License Agreement and BJ Dierkes' notice of copyright, i.e., -"Copyright (c) 2009 BJ Dierkes; All Rights Reserved" are retained in Cement -CLI Application Framework for Python alone or in any derivative version -prepared by Licensee. +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: -3. In the event Licensee prepares a derivative work that is based on -or incorporates Cement CLI Application Framework for Python or any part -thereof, and wants to make the derivative work available to others as provided -herein, then Licensee hereby agrees to include in any such work a brief -summary of the changes made to Cement CLI Application Framework for Python. - -4. BJ Dierkes is making Cement CLI Application Framework for Python available -to Licensee on an "AS IS" basis. BJ Dierkes MAKES NO REPRESENTATIONS OR -WARRANTIES, EXPRESS OR IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, BJ -Dierkes MAKES NO AND DISCLAIMS ANY REPRESENTATION OR WARRANTY OF -MERCHANTAPILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF -CEMENT CLI APPLICATION FOR PYTHON WILL NOT INFRINGE ANY THIRD PARTY RIGHTS. - -5. BJ Dierkes SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF CEMENT -CLI APPLICATION FRAMEWORK FOR PYTHON FOR ANY INCIDENTAL, SPECIAL, OR -CONSEQUENTIAL DAMAGES OR LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR -OTHERWISE USING CEMENT CLI APPLICATION FRAMEWORK FOR PYTHON, OR ANY DERIVATIVE -THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. - -6. This License Agreement will automatically terminate upon a material -breach of its terms and conditions. - -7. Nothing in this License Agreement shall be deemed to create any -relationship of agency, partnership, or joint venture between BJ Dierkes and -Licensee. This License Agreement does not grant permission to use BJ Dierkes' -trademarks or trade name in a trademark sense to endorse or promote -products or services of Licensee, or any third party. - -8. By copying, installing or otherwise using Cement CLI Application Framework -for Python, Licensee agrees to be bound by the terms and conditions of this -License Agreement. +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. \ No newline at end of file diff --git a/README b/README index 1557f1f8..f435ac19 100644 --- a/README +++ b/README @@ -29,17 +29,17 @@ cli application from the very start with more or less a single command via the paster utility. Cement brings an end to the 'hack it out, and [maybe] clean it up later' routine that we all find ourselves in under deadlines. -Any application can utilize existing plugins from the CementPlugins -project, or from other 3rd party resources to extend functionality. The -plugin system is designed to allow portability of re-usable code, and it -is encouraged to contribute any plugins back to the project to extend the -functionality of Cement. +Any application can utilize existing plugins from The Rosendale Project, or +from other 3rd party resources to extend functionality. The plugin system is +designed to allow portability of re-usable code, and it is encouraged to +contribute any plugins back to the project to extend the functionality of +Cement. The Cement CLI Application Framework is Open Source and is distributed under -the Python Software Foundation License. When creating plugins specifically -for re-use within the community, please be sure to follow the standard naming -convention "HelloWorld Plugin for Cement" as an example. The actual module -name should be 'cement.plugins.helloworld'. +The MIT License. When creating plugins specifically for re-use within the +community, please be sure to follow the standard naming convention +'HelloWorld Plugin for Cement' as an example. The actual module name should +be 'cement.plugins.helloworld'. GETTING STARTED: diff --git a/cement/core/controller.py b/cement/core/controller.py index 209bc45e..bdfe0945 100644 --- a/cement/core/controller.py +++ b/cement/core/controller.py @@ -225,8 +225,6 @@ class expose(object): 'original_func' : func, 'func' : self.name, 'controller_namespace' : con_namespace, - #'module' : func.__module__, - #'controller' : controller } # Set the command info in the dest namespace diff --git a/setup.py b/setup.py index 2b8d2c8f..ca1e5455 100644 --- a/setup.py +++ b/setup.py @@ -29,17 +29,17 @@ cli application from the very start with more or less a single command via the paster utility. Cement brings an end to the 'hack it out, and [maybe] clean it up later' routine that we all find ourselves in under deadlines. -Any application can utilize existing plugins from the CementPlugins -project, or from other 3rd party resources to extend functionality. The -plugin system is designed to allow portability of re-usable code, and it -is encouraged to contribute any plugins back to the project to extend the -functionality of Cement. +Any application can utilize existing plugins from The Rosendale Project, or +from other 3rd party resources to extend functionality. The plugin system is +designed to allow portability of re-usable code, and it is encouraged to +contribute any plugins back to the project to extend the functionality of +Cement. -The Cement CLI Application Framework for Python is Open Source and is -distributed under the Python Software Foundation License. When creating -plugins specifically for re-use within the community, please be sure to -follow the standard naming convention "HelloWorld Plugin for Cement" as an -example. The actual module name should be 'cement.plugins.helloworld'. +The Cement CLI Application Framework is Open Source and is distributed under +The MIT License. When creating plugins specifically for re-use within the +community, please be sure to follow the standard naming convention +'HelloWorld Plugin for Cement' as an example. The actual module name should +be 'yourapp.plugins.helloworld'. GETTING STARTED: