Enable flake8 E402: Module level import not at top of file

This also removes some exceptions for isort which are not really necessary.

Author: phw

.isort.cfg

@@ -22,7 +22,7 @@ multi_line_output=3
 order_by_type=True
 sections=FUTURE,STDLIB,THIRDPARTY,QT,TEST,PICARD,LOCALFOLDER,RESOURCES,PICARD_UI
 skip_glob=**/ui_*.py
-skip=./tagger.py,picard/const/attributes.py,picard/const/countries.py,picard/resources.py,scripts/picard.in,picard/const/__init__.py,picard/formats/__init__.py,picard/coverart/providers/__init__.py
+skip=./tagger.py,picard/resources.py,scripts/picard.in,picard/const/__init__.py
 not_skip=__init__.py
 use_parentheses=1
 lines_after_imports=2

.prospector.yml

@@ -8,7 +8,6 @@ pep8:
     - E129
     - E226
     - E241
-    - E402
     - E501
     - W503
 

picard/const/__init__.py

@@ -29,17 +29,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
+import builtins
 from collections import OrderedDict
 import os
 
 from PyQt5.QtCore import QStandardPaths
+
 from picard import (
     PICARD_APP_NAME,
     PICARD_ORG_NAME,
 )
+from picard.const.attributes import MB_ATTRIBUTES
 
 # Install gettext "noop" function in case const.py gets imported directly.
-import builtins
 builtins.__dict__['N_'] = lambda a: a
 
 
@@ -90,7 +92,6 @@
 DATA_TRACK_TITLE = '[data track]'
 
 # Release formats
-from picard.const.attributes import MB_ATTRIBUTES
 RELEASE_FORMATS = {}
 RELEASE_PRIMARY_GROUPS = {}
 RELEASE_SECONDARY_GROUPS = {}
@@ -106,13 +107,13 @@
         RELEASE_STATUS[v] = v
 
 # Release countries
-from picard.const.countries import RELEASE_COUNTRIES  # noqa: F401 # pylint: disable=unused-import
+from picard.const.countries import RELEASE_COUNTRIES  # noqa: F401,E402 # pylint: disable=unused-import
 
 # List of available user interface languages
-from picard.const.languages import UI_LANGUAGES  # noqa: F401 # pylint: disable=unused-import
+from picard.const.languages import UI_LANGUAGES  # noqa: F401,E402 # pylint: disable=unused-import
 
 # List of alias locales
-from picard.const.locales import ALIAS_LOCALES  # noqa: F401 # pylint: disable=unused-import
+from picard.const.locales import ALIAS_LOCALES  # noqa: F401,E402 # pylint: disable=unused-import
 
 # List of official musicbrainz servers - must support SSL for mblogin requests (such as collections).
 MUSICBRAINZ_SERVERS = [

picard/coverart/providers/__init__.py

@@ -24,12 +24,28 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
-from collections import defaultdict, namedtuple
+from collections import (
+    defaultdict,
+    namedtuple,
+)
 import traceback
 
-from picard import log, config
+from picard import (
+    config,
+    log,
+)
+from picard.coverart.providers.caa import CoverArtProviderCaa
+from picard.coverart.providers.caa_release_group import (
+    CoverArtProviderCaaReleaseGroup,
+)
+from picard.coverart.providers.local import CoverArtProviderLocal
+from picard.coverart.providers.whitelist import CoverArtProviderWhitelist
 from picard.plugin import ExtensionPoint
-from picard.ui.options import OptionsPage, register_options_page
+
+from picard.ui.options import (
+    OptionsPage,
+    register_options_page,
+)
 
 
 _cover_art_providers = ExtensionPoint(label='cover_art_providers')
@@ -180,11 +196,6 @@ def match_url_relations(self, relation_types, func):
             self.error(traceback.format_exc())
 
 
-from picard.coverart.providers.local import CoverArtProviderLocal
-from picard.coverart.providers.caa import CoverArtProviderCaa
-from picard.coverart.providers.whitelist import CoverArtProviderWhitelist
-from picard.coverart.providers.caa_release_group import CoverArtProviderCaaReleaseGroup
-
 __providers = [
     CoverArtProviderLocal,
     CoverArtProviderCaa,

picard/formats/__init__.py

@@ -28,8 +28,38 @@
 
 
 from picard import log
+from picard.formats.ac3 import AC3File
+from picard.formats.apev2 import (
+    AACFile,
+    MonkeysAudioFile,
+    MusepackFile,
+    OptimFROGFile,
+    TAKFile,
+    WavPackFile,
+)
+from picard.formats.asf import ASFFile
+from picard.formats.id3 import (
+    AiffFile,
+    DSFFile,
+    MP3File,
+    TrueAudioFile,
+)
+from picard.formats.midi import MIDIFile
+from picard.formats.mp4 import MP4File
+from picard.formats.vorbis import (
+    FLACFile,
+    OggAudioFile,
+    OggFLACFile,
+    OggOpusFile,
+    OggSpeexFile,
+    OggTheoraFile,
+    OggVideoFile,
+    OggVorbisFile,
+)
+from picard.formats.wav import WAVFile
 from picard.plugin import ExtensionPoint
 
+
 _formats = ExtensionPoint(label='formats')
 _extensions = {}
 
@@ -99,62 +129,26 @@ def open_(filename):
         return None
 
 
-from picard.formats.id3 import (
-    AiffFile,
-    DSFFile,
-    MP3File,
-    TrueAudioFile,
-)
+register_format(AACFile)
+register_format(AC3File)
 register_format(AiffFile)
+register_format(ASFFile)
 register_format(DSFFile)
-register_format(MP3File)
-register_format(TrueAudioFile)
-
-from picard.formats.apev2 import (
-    AACFile,
-    MonkeysAudioFile,
-    MusepackFile,
-    OptimFROGFile,
-    TAKFile,
-    WavPackFile,
-)
-register_format(AACFile)
+register_format(FLACFile)
+register_format(MIDIFile)
 register_format(MonkeysAudioFile)
+register_format(MP3File)
+register_format(MP4File)
 register_format(MusepackFile)
-register_format(OptimFROGFile)
-register_format(TAKFile)
-register_format(WavPackFile)
-
-from picard.formats.vorbis import (
-    FLACFile,
-    OggFLACFile,
-    OggSpeexFile,
-    OggTheoraFile,
-    OggVorbisFile,
-    OggAudioFile,
-    OggVideoFile,
-    OggOpusFile,
-)
-register_format(FLACFile)
+register_format(OggAudioFile)
 register_format(OggFLACFile)
+register_format(OggOpusFile)
 register_format(OggSpeexFile)
 register_format(OggTheoraFile)
-register_format(OggVorbisFile)
-register_format(OggOpusFile)
-register_format(OggAudioFile)
 register_format(OggVideoFile)
-
-from picard.formats.mp4 import MP4File
-register_format(MP4File)
-
-from picard.formats.asf import ASFFile
-register_format(ASFFile)
-
-from picard.formats.wav import WAVFile
+register_format(OggVorbisFile)
+register_format(OptimFROGFile)
+register_format(TAKFile)
+register_format(TrueAudioFile)
 register_format(WAVFile)
-
-from picard.formats.midi import MIDIFile
-register_format(MIDIFile)
-
-from picard.formats.ac3 import AC3File
-register_format(AC3File)
+register_format(WavPackFile)

setup.cfg

@@ -4,10 +4,9 @@
 # E129: visually indented line with same indent as next logical line
 # E226: missing whitespace around arithmetic operator
 # E241: multiple spaces after ','
-# E402: module level import not at top of file
 # E501: line too long (xx > 79 characters)
 # W503: line break occurred before a binary operator
-ignore = E127,E128,E129,E226,E241,E402,E501,W503
+ignore = E127,E128,E129,E226,E241,E501,W503
 builtins = _,N_,ngettext,gettext_attributes,gettext_countries,string_
 exclude = ui_*.py,picard/resources.py