cleanup !wip

AUTHORS.rst

@@ -35,3 +35,4 @@ and has been contributed to by (ordered by date of first contribution):
   * deoren@users.noreply.github.com
   * chamatht@gmail.com
   * Mic92@users.noreply.github.com
+* guillaume.web@gmail.com

HISTORY.rst

@@ -3,6 +3,17 @@ Release History
 
 .. :changelog:
 
+v0.9a0 (2019-02-09)
+-------------------
+
+Changes
+~~~~~~~
+- Merge 0.9 devel (no more Python2)
+
+Fix
+~~~
+- Double quoting matters on env markers, hmm.
+
 v0.8.9 (2019-01-12) : Descent Into...
 --------------------------------------
 

docs/eyed3.rst

@@ -10,7 +10,6 @@ Subpackages
     eyed3.mp3
     eyed3.plugins
     eyed3.utils
-    eyed3.vorbis
 
 Submodules
 ----------

src/eyed3/core.py

@@ -14,8 +14,6 @@
 """Audio type selector for no audio."""
 AUDIO_MP3 = 1
 """Audio type selector for mpeg (mp3) audio."""
-AUDIO_VORBIS = 2
-"""Audio type selector for ogg (vorbis) audio."""
 
 
 AUDIO_TYPES = (AUDIO_NONE, AUDIO_MP3)
@@ -70,7 +68,7 @@ def load(path, tag_version=None):
     metadata is loaded. This value must be a version constant specific to the
     eventual format of the metadata.
     """
-    from . import mp3, id3, vorbis
+    from . import mp3, id3
     if not isinstance(path, pathlib.Path):
         path = pathlib.Path(path)
     log.debug("Loading file: %s" % path)
@@ -87,8 +85,6 @@ def load(path, tag_version=None):
     if (mtype in mp3.MIME_TYPES or
             (mtype in mp3.OTHER_MIME_TYPES and path.suffix.lower() in mp3.EXTENSIONS)):
         return mp3.Mp3AudioFile(path, tag_version)
-    elif mtype in vorbis.MIME_TYPES:
-        return vorbis.VorbisAudioFile(path)
     elif mtype == "application/x-id3":
         return id3.TagFile(path, tag_version)
     else:

src/eyed3/id3/frames.py

@@ -411,7 +411,7 @@ def url(self, url):
         if isinstance(url, bytes):
             url = str(url, ISO_8859_1)
         else:
-            _ = url.encode(ISO_8859_1)  # Likewise, it must encode
+            url.encode(ISO_8859_1)  # Likewise, it must encode
 
         self._url = url
 

src/eyed3/main.py

@@ -262,7 +262,7 @@ def _main():
     except KeyboardInterrupt:
         retval = 0
     except (StopIteration, IOError) as ex:
-        eyed3.utils.console.printError(UnicodeType(ex))
+        eyed3.utils.console.printError(str(ex))
         retval = 1
     except Exception as ex:
         eyed3.utils.console.printError("Uncaught exception: %s\n" % str(ex))

src/eyed3/utils/__init__.py

@@ -190,20 +190,6 @@ def requireBytes(*args):
     return _requireArgType(bytes, *args)
 
 
-def encodeUnicode(replace=True):
-    warnings.warn("use compat PY2 and be more python3", DeprecationWarning,
-                  stacklevel=2)
-    enc_err = "replace" if replace else "strict"
-
-    # This decorator is used to encode unicode to bytes for sys.std*
-    # write calls. In python3 unicode (or str) is required by these
-    # functions, the encoding happens internally.. So return a noop
-    def noop(fn):
-        def call(*args, **kwargs):
-            return fn(*args, **kwargs)
-    return noop
-
-
 def formatTime(seconds, total=None, short=False):
     """
     Format ``seconds`` (number of seconds) as a string representation.

src/eyed3/utils/prompt.py

@@ -1,5 +1,4 @@
 import sys as _sys
-from .. import LOCAL_ENCODING
 from .console import Fore as fg
 
 DISABLE_PROMPT = None