From d765e5cdf8ae7e56b044e7989b0287bf6e413f9d Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 10 Feb 2020 08:25:25 +0100 Subject: [PATCH] docs: Remove various Python 2 related references --- docs/api/base.rst | 7 +++---- docs/conf.py | 3 +-- docs/index.rst | 4 ++-- docs/user/filelike.rst | 5 ++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/docs/api/base.rst b/docs/api/base.rst index bc198378..8765765a 100644 --- a/docs/api/base.rst +++ b/docs/api/base.rst @@ -52,20 +52,19 @@ Other Classes and Functions .. class:: text() This type only exists for documentation purposes. It represents - :obj:`unicode` under Python 2 and :obj:`str` under Python 3. + :obj:`python:str` under Python 3. .. class:: bytes() This type only exists for documentation purposes. It represents - :obj:`python:str` under Python 2 and :obj:`python3:bytes` under Python 3. + :obj:`python:bytes` under Python 3. .. class:: fspath() This type only exists for documentation purposes. It represents a file - name which can be :obj:`python:str` or :obj:`python:unicode` under Python - 2 and :obj:`python3:bytes` or :obj:`python3:str` under Python 3. + name which can be :obj:`python:str` or :obj:`python:bytes` under Python 3. .. class:: fileobj() diff --git a/docs/conf.py b/docs/conf.py index 70879ee0..1867be81 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,8 +16,7 @@ 'sphinx.ext.extlinks', ] intersphinx_mapping = { - 'python': ('https://docs.python.org/2', None), - 'python3': ('https://docs.python.org/3', None), + 'python': ('https://docs.python.org/3', None), } source_suffix = '.rst' master_doc = 'index' diff --git a/docs/index.rst b/docs/index.rst index af2c97bf..baea49b0 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -31,13 +31,13 @@ Installing :: - pip install mutagen + python3 -m pip install mutagen or :: - sudo apt-get install python-mutagen python3-mutagen + sudo apt-get install python3-mutagen Where do I get it? diff --git a/docs/user/filelike.rst b/docs/user/filelike.rst index 8c9e33ca..7b0b56ad 100644 --- a/docs/user/filelike.rst +++ b/docs/user/filelike.rst @@ -5,9 +5,8 @@ Working with File-like Objects .. currentmodule:: mutagen The first argument passed to a :class:`FileType` or :class:`Metadata` can -either be a file name or a file-like object, such as `StringIO -` (`BytesIO ` in Python 3) and mutagen will -figure out what to do. +either be a file name or a file-like object, such as `BytesIO ` +and mutagen will figure out what to do. ::