From e3b6e39708231a84a9de05020d674f2b9e5d08f9 Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 1 Oct 2016 16:58:21 +0300 Subject: fix licensing notices --- LICENSE.txt | 10 +++++----- README.md | 3 +-- bin/mutual_friends.py | 7 ++++--- bin/online_sessions.py | 7 ++++--- bin/track_status.py | 7 ++++--- vk/api.py | 8 +++++--- vk/error.py | 7 ++++--- vk/last_seen.py | 7 ++++--- vk/platform.py | 7 ++++--- vk/tracking/db/__init__.py | 7 ++++--- vk/tracking/db/backend/__init__.py | 7 ++++--- vk/tracking/db/backend/csv.py | 7 ++++--- vk/tracking/db/backend/log.py | 7 ++++--- vk/tracking/db/backend/null.py | 7 ++++--- vk/tracking/db/format.py | 7 ++++--- vk/tracking/db/record.py | 7 ++++--- vk/tracking/db/timestamp.py | 7 ++++--- vk/tracking/online_sessions.py | 7 ++++--- vk/tracking/status_tracker.py | 7 ++++--- vk/user.py | 7 ++++--- 20 files changed, 79 insertions(+), 61 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index fbbdd68..62c44fd 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -The MIT License (MIT) +MIT License Copyright (c) 2015 Egor Tensin @@ -9,13 +9,13 @@ 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. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 6744ea2..617c5ad 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,7 @@ online. License ------- -This project, including all of the files and their contents, is licensed under -the terms of the MIT License. +Distributed under the MIT License. See [LICENSE.txt] for details. [LICENSE.txt]: LICENSE.txt diff --git a/bin/mutual_friends.py b/bin/mutual_friends.py index 9a1dfc4..8e6e584 100644 --- a/bin/mutual_friends.py +++ b/bin/mutual_friends.py @@ -1,6 +1,7 @@ -# Copyright 2015 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2015 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. import argparse from collections import OrderedDict diff --git a/bin/online_sessions.py b/bin/online_sessions.py index 3732f4c..dc1a2ee 100644 --- a/bin/online_sessions.py +++ b/bin/online_sessions.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. import argparse import csv diff --git a/bin/track_status.py b/bin/track_status.py index a5befef..84495f9 100644 --- a/bin/track_status.py +++ b/bin/track_status.py @@ -1,6 +1,7 @@ -# Copyright 2015 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2015 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. import argparse, sys diff --git a/vk/api.py b/vk/api.py index 933d3a5..e942172 100644 --- a/vk/api.py +++ b/vk/api.py @@ -1,6 +1,7 @@ -# Copyright 2015 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2015 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from collections import Iterable from collections.abc import Mapping @@ -99,6 +100,7 @@ class API: response = json.loads(response.read().decode()) if 'response' not in response: raise vk.error.InvalidAPIResponseError(response) + #print(response) return response['response'] except (ConnectionError, URLError): raise vk.error.APIConnectionError() diff --git a/vk/error.py b/vk/error.py index 4182449..3a309c3 100644 --- a/vk/error.py +++ b/vk/error.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. class APIError(RuntimeError): pass diff --git a/vk/last_seen.py b/vk/last_seen.py index 9f0c650..ac62d65 100644 --- a/vk/last_seen.py +++ b/vk/last_seen.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from collections import OrderedDict from collections.abc import MutableMapping diff --git a/vk/platform.py b/vk/platform.py index 5f87e41..fa1e665 100644 --- a/vk/platform.py +++ b/vk/platform.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from enum import Enum import re diff --git a/vk/tracking/db/__init__.py b/vk/tracking/db/__init__.py index 9e6b74a..8019244 100644 --- a/vk/tracking/db/__init__.py +++ b/vk/tracking/db/__init__.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from .format import Format diff --git a/vk/tracking/db/backend/__init__.py b/vk/tracking/db/backend/__init__.py index 68de924..58b5a9a 100644 --- a/vk/tracking/db/backend/__init__.py +++ b/vk/tracking/db/backend/__init__.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from . import csv, log, null diff --git a/vk/tracking/db/backend/csv.py b/vk/tracking/db/backend/csv.py index 10a504f..f20c617 100644 --- a/vk/tracking/db/backend/csv.py +++ b/vk/tracking/db/backend/csv.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from collections.abc import Iterable import csv diff --git a/vk/tracking/db/backend/log.py b/vk/tracking/db/backend/log.py index 03548eb..6eebc35 100644 --- a/vk/tracking/db/backend/log.py +++ b/vk/tracking/db/backend/log.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. import logging diff --git a/vk/tracking/db/backend/null.py b/vk/tracking/db/backend/null.py index 139a9f0..6454f84 100644 --- a/vk/tracking/db/backend/null.py +++ b/vk/tracking/db/backend/null.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from collections.abc import Iterable diff --git a/vk/tracking/db/format.py b/vk/tracking/db/format.py index 862c20e..9d5c6e4 100644 --- a/vk/tracking/db/format.py +++ b/vk/tracking/db/format.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from enum import Enum diff --git a/vk/tracking/db/record.py b/vk/tracking/db/record.py index 2bd17c1..c03c3ca 100644 --- a/vk/tracking/db/record.py +++ b/vk/tracking/db/record.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from collections import OrderedDict from collections.abc import MutableMapping diff --git a/vk/tracking/db/timestamp.py b/vk/tracking/db/timestamp.py index 35cf5b3..b2219ca 100644 --- a/vk/tracking/db/timestamp.py +++ b/vk/tracking/db/timestamp.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from datetime import datetime, timezone diff --git a/vk/tracking/online_sessions.py b/vk/tracking/online_sessions.py index debf1e6..204e1cc 100644 --- a/vk/tracking/online_sessions.py +++ b/vk/tracking/online_sessions.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from collections import OrderedDict from collections.abc import MutableMapping diff --git a/vk/tracking/status_tracker.py b/vk/tracking/status_tracker.py index c357274..d47de39 100644 --- a/vk/tracking/status_tracker.py +++ b/vk/tracking/status_tracker.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from collections.abc import Callable import time diff --git a/vk/user.py b/vk/user.py index 08ce5bb..f63f793 100644 --- a/vk/user.py +++ b/vk/user.py @@ -1,6 +1,7 @@ -# Copyright 2016 Egor Tensin -# This file is licensed under the terms of the MIT License. -# See LICENSE.txt for details. +# Copyright (c) 2016 Egor Tensin +# This file is part of the "VK scripts" project. +# For details, see https://github.com/egor-tensin/vk-scripts. +# Distributed under the MIT License. from collections import OrderedDict from collections.abc import Hashable, Mapping, MutableMapping -- cgit v1.2.3