diff options
| author | davidpshaw <davidpshaw@gmail.com> | 2014-05-06 21:12:36 -0400 |
|---|---|---|
| committer | davidpshaw <davidpshaw@gmail.com> | 2014-05-06 21:12:36 -0400 |
| commit | 0ecd0ba3abd524fb39b2a87e553abcdba5f2dde4 (patch) | |
| tree | 50b98038d13a3f2c9cf65a48af0b6e9bac4111ad /libmproxy/contrib/wbxml/ASWBXMLCodePage.py | |
| parent | ec855315807726a6b64c42910d97ee378d62ad28 (diff) | |
| download | mitmproxy-0ecd0ba3abd524fb39b2a87e553abcdba5f2dde4.tar.gz mitmproxy-0ecd0ba3abd524fb39b2a87e553abcdba5f2dde4.tar.bz2 mitmproxy-0ecd0ba3abd524fb39b2a87e553abcdba5f2dde4.zip | |
- changed license to MIT, as it is more easily integrated into the mitmproxy project
Diffstat (limited to 'libmproxy/contrib/wbxml/ASWBXMLCodePage.py')
| -rw-r--r-- | libmproxy/contrib/wbxml/ASWBXMLCodePage.py | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/libmproxy/contrib/wbxml/ASWBXMLCodePage.py b/libmproxy/contrib/wbxml/ASWBXMLCodePage.py index 54b5d941..2f9d8717 100644 --- a/libmproxy/contrib/wbxml/ASWBXMLCodePage.py +++ b/libmproxy/contrib/wbxml/ASWBXMLCodePage.py @@ -5,21 +5,27 @@ Inspired by EAS Inspector for Fiddler https://easinspectorforfiddler.codeplex.com ------ Apache License, Version 2.0 ----- +----- The MIT License (MIT) ----- Filename: ASWBXMLCodePage.py -Copyright 2014, David P. Shaw +Copyright (c) 2014, David P. Shaw - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at +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: - http://www.apache.org/licenses/LICENSE-2.0 +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +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. ''' class ASWBXMLCodePage: def __init__(self): |