From 4f862879e2f65d439753876b221dd6be2284929c Mon Sep 17 00:00:00 2001 From: Lynne Date: Mon, 18 Jan 2021 22:24:31 +1000 Subject: [PATCH] shuffling of stufflings --- bcao/__init__.py | 1 + bcao/__main__.py | 7 +------ bcao/song_info.py | 6 +++++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bcao/__init__.py b/bcao/__init__.py index 795ba80..cdfd9a2 100644 --- a/bcao/__init__.py +++ b/bcao/__init__.py @@ -24,3 +24,4 @@ fully_supported: List[str] = ["ogg", "flac", "mp3", "m4a", "wav", "aiff"] MutagenFile = Union[MP3, FLAC, OggVorbis, mutagen.FileType] MutagenTags = Union[ID3Tags, Tags, mutagen.oggvorbis.OggVCommentDict] sanitisation_regex = re.compile(r"[?\\/:|*\"<>]") + diff --git a/bcao/__main__.py b/bcao/__main__.py index 794dcf8..0fb9bda 100755 --- a/bcao/__main__.py +++ b/bcao/__main__.py @@ -5,12 +5,7 @@ # input: a .zip from bandcamp # output: it organises it, adds cover art, puts it in the right place... -# pycharm tells me some of these classes shouldn't be imported because they're not declared in __all__. -# however, the mutagen docs show example code where someone creates a mutagen.flac.Picture by referring to it as -# Picture(), implying that they had imported mutagen.flac.Picture, and therefore i'm right and the computer is WRONG -# https://mutagen.readthedocs.io/en/latest/api/flac.html#mutagen.Picture.data - -from . import * +from bcao import * from bcao.song_info import SongInfo import argparse diff --git a/bcao/song_info.py b/bcao/song_info.py index 3f60de5..0916ce7 100644 --- a/bcao/song_info.py +++ b/bcao/song_info.py @@ -1,4 +1,4 @@ -from . import * +from bcao import * import re from os import path @@ -6,6 +6,10 @@ from typing import Union, List, Dict from pathlib import Path from base64 import b64encode +# pycharm tells me some of these classes shouldn't be imported because they're not declared in __all__. +# however, the mutagen docs show example code where someone creates a mutagen.flac.Picture by referring to it as +# Picture(), implying that they had imported mutagen.flac.Picture, and therefore i'm right and the computer is WRONG +# https://mutagen.readthedocs.io/en/latest/api/flac.html#mutagen.Picture.data import mutagen # noinspection PyProtectedMember from mutagen.flac import Picture