summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjvoisin2011-09-18 20:57:57 +0200
committerjvoisin2011-09-18 20:57:57 +0200
commit2cb6163f1723404e03908dafc536028af4910eaf (patch)
tree4db2307bfc2404d001b9fa782098b5e18cf7f5f0
parent900a194d27df6fa79145556009e72f640b8974aa (diff)
Revert "Update license"
This reverts commit fdde36b1dc6660fc7936626bdafc07cb8064440d.
-rw-r--r--mat/bencode/bencode.py32
1 files changed, 21 insertions, 11 deletions
diff --git a/mat/bencode/bencode.py b/mat/bencode/bencode.py
index 9066a06..739ffe5 100644
--- a/mat/bencode/bencode.py
+++ b/mat/bencode/bencode.py
@@ -1,15 +1,25 @@
1# The contents of this file are subject to the BitTorrent Open Source License 1# Copyright 2007 by Petru Paler
2# Version 1.1 (the License). You may not copy or use this file, in either 2# Copyright 2011 by Julien (jvoisin) Voisin
3# source code or executable form, except in compliance with the License. You 3#
4# may obtain a copy of the License at http://www.bittorrent.com/license/. 4# Permission is hereby granted, free of charge, to any person obtaining a copy
5# of this software and associated documentation files (the "Software"), to deal
6# in the Software without restriction, including without limitation the rights
7# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8# copies of the Software, and to permit persons to whom the Software is
9# furnished to do so, subject to the following conditions:
10#
11# The above copyright notice and this permission notice shall be included in
12# all copies or substantial portions of the Software.
13#
14# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19# FROM,
20# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21# THE SOFTWARE.
5# 22#
6# Software distributed under the License is distributed on an AS IS basis,
7# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
8# for the specific language governing rights and limitations under the
9# License.
10
11# Copyright 2007 Petru Paler
12# Copyright 2011 Julien (jvoisin) Voisin
13 23
14''' 24'''
15 A quick (and also nice) lib to bencode/bdecode torrent files 25 A quick (and also nice) lib to bencode/bdecode torrent files