From fdfc8cce0638833855f464a5e82619a8ceb56e91 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Fri, 31 Jan 2020 06:50:50 -0500 Subject: [PATCH] Copyright headers cleanup Element of #142 New year lint removal --- common.py | 4 ++-- exts/ae7q.py | 20 +++++++++++--------- exts/base.py | 4 ++-- exts/fun.py | 5 +++-- exts/grid.py | 5 +++-- exts/ham.py | 5 +++-- exts/image.py | 5 +++-- exts/lookup.py | 5 +++-- exts/morse.py | 5 +++-- exts/qrz.py | 6 ++++-- exts/study.py | 5 +++-- exts/weather.py | 5 +++-- info.py | 18 +++--------------- main.py | 4 ++-- resources/callsign_info.py | 5 +++-- resources/morse.py | 6 ++++-- resources/phonetics.py | 5 +++-- resources/qcodes.py | 6 ++++-- resources/study.py | 5 +++-- utils/connector.py | 4 ++-- 20 files changed, 67 insertions(+), 60 deletions(-) diff --git a/common.py b/common.py index 43a248a..fb6ecb8 100644 --- a/common.py +++ b/common.py @@ -3,8 +3,8 @@ Common tools for the bot. --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ diff --git a/exts/ae7q.py b/exts/ae7q.py index f85b898..ac7b878 100644 --- a/exts/ae7q.py +++ b/exts/ae7q.py @@ -3,17 +3,19 @@ ae7q extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. ---- -Test callsigns: -KN8U: active, restricted -AB2EE: expired, restricted -KE8FGB: assigned once, no restrictions -KV4AAA: unassigned, no records -KC4USA: reserved, no call history, *but* has application history +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + +# Test callsigns: +# KN8U: active, restricted +# AB2EE: expired, restricted +# KE8FGB: assigned once, no restrictions +# KV4AAA: unassigned, no records +# KC4USA: reserved, no call history, *but* has application history + + import discord.ext.commands as commands import aiohttp diff --git a/exts/base.py b/exts/base.py index 2d04845..ed0ba5a 100644 --- a/exts/base.py +++ b/exts/base.py @@ -3,8 +3,8 @@ Base extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ diff --git a/exts/fun.py b/exts/fun.py index dddd480..e6890d6 100644 --- a/exts/fun.py +++ b/exts/fun.py @@ -3,10 +3,11 @@ Fun extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + import random import discord.ext.commands as commands diff --git a/exts/grid.py b/exts/grid.py index a851b42..6694109 100644 --- a/exts/grid.py +++ b/exts/grid.py @@ -3,10 +3,11 @@ Grid extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + import math import discord.ext.commands as commands diff --git a/exts/ham.py b/exts/ham.py index 062ecc9..88e31c9 100644 --- a/exts/ham.py +++ b/exts/ham.py @@ -3,10 +3,11 @@ Ham extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + from datetime import datetime import discord.ext.commands as commands diff --git a/exts/image.py b/exts/image.py index 33abed9..d0a792c 100644 --- a/exts/image.py +++ b/exts/image.py @@ -3,10 +3,11 @@ Image extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + import io import aiohttp diff --git a/exts/lookup.py b/exts/lookup.py index 6416386..b085427 100644 --- a/exts/lookup.py +++ b/exts/lookup.py @@ -3,10 +3,11 @@ Lookup extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + import threading from discord.ext import commands, tasks diff --git a/exts/morse.py b/exts/morse.py index 0aa144b..03dc0d3 100644 --- a/exts/morse.py +++ b/exts/morse.py @@ -3,10 +3,11 @@ Morse Code extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + import discord.ext.commands as commands import common as cmn diff --git a/exts/qrz.py b/exts/qrz.py index 6bc1b0f..89c3638 100644 --- a/exts/qrz.py +++ b/exts/qrz.py @@ -3,9 +3,11 @@ QRZ extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + + from collections import OrderedDict from io import BytesIO diff --git a/exts/study.py b/exts/study.py index eca0964..c4fe92f 100644 --- a/exts/study.py +++ b/exts/study.py @@ -3,10 +3,11 @@ Study extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + import random import json from datetime import datetime diff --git a/exts/weather.py b/exts/weather.py index 0668a83..e7a2977 100644 --- a/exts/weather.py +++ b/exts/weather.py @@ -3,10 +3,11 @@ Weather extension for qrm --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + import io import re diff --git a/info.py b/info.py index eb1cb34..228d4c7 100644 --- a/info.py +++ b/info.py @@ -3,23 +3,11 @@ Static info about the bot. --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. ---- - -`authors`: The authors of the bot. - -`description`: A description of the bot. - -`license`: The license the bot is released under. - -`contrubuting`: Info on how to contribute to the bot. - -`release`: Current bot version. - -`release_timestamp`: When the bot was last released. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ + authors = ("@ClassAbbyAmplifier#2229", "@0x5c#0639") description = """A bot with various useful ham radio-related functions, written in Python.""" license = "Released under the GNU General Public License v2" diff --git a/main.py b/main.py index 3013bdc..0a0437a 100644 --- a/main.py +++ b/main.py @@ -4,8 +4,8 @@ qrm, a bot for Discord --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """ diff --git a/resources/callsign_info.py b/resources/callsign_info.py index 45055de..3526abf 100644 --- a/resources/callsign_info.py +++ b/resources/callsign_info.py @@ -3,10 +3,11 @@ Information about callsigns for the vanity prefixes command in hamcog. --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrmbot and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrmbot and is released under the terms of +the GNU General Public License, version 2. """ + from collections import OrderedDict diff --git a/resources/morse.py b/resources/morse.py index 73bad78..6af8647 100644 --- a/resources/morse.py +++ b/resources/morse.py @@ -3,9 +3,11 @@ A listing of morse code symbols --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrmbot and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrmbot and is released under the terms of +the GNU General Public License, version 2. """ + + morse = { "A": ".-", "B": "-...", diff --git a/resources/phonetics.py b/resources/phonetics.py index 18d13c4..2dc637f 100644 --- a/resources/phonetics.py +++ b/resources/phonetics.py @@ -3,10 +3,11 @@ A listing of NATO Phonetics --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrmbot and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrmbot and is released under the terms of +the GNU General Public License, version 2. """ + phonetics = { "a": "alfa", "b": "bravo", diff --git a/resources/qcodes.py b/resources/qcodes.py index 394472c..1f9d9ec 100644 --- a/resources/qcodes.py +++ b/resources/qcodes.py @@ -3,9 +3,11 @@ A listing of Q Codes --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrmbot and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrmbot and is released under the terms of +the GNU General Public License, version 2. """ + + # flake8: noqa qcodes = {"QAB": "May I have clearance (for ...) from ... (place) to ... (place) at flight level/altitude ... ? / You are cleared (or ... is cleared) by ... from ... (place) to ... (place) at flight level/altitude ...", "QAF": "Will you advise me when you are (were) at (over) ... (place)? / I am (was) at (over) ... (place) (at ... hours) at flight level/altitude ...", diff --git a/resources/study.py b/resources/study.py index 858f5db..558bfd6 100644 --- a/resources/study.py +++ b/resources/study.py @@ -3,10 +3,11 @@ A listing of hamstudy command resources --- Copyright (C) 2019-2020 Abigail Gold, 0x5c -This file is part of discord-qrmbot and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrmbot and is released under the terms of +the GNU General Public License, version 2. """ + pool_names = { "us": { "technician": "E2", diff --git a/utils/connector.py b/utils/connector.py index 7fce782..33601a0 100644 --- a/utils/connector.py +++ b/utils/connector.py @@ -3,8 +3,8 @@ Wrapper to handle aiohttp connector creation. --- Copyright (C) 2020 Abigail Gold, 0x5c -This file is part of discord-qrm2 and is released under the terms of the GNU -General Public License, version 2. +This file is part of discord-qrm2 and is released under the terms of +the GNU General Public License, version 2. """