Skip to content

Commit

Permalink
Merge pull request #289 from pylast/rm-2-3.4
Browse files Browse the repository at this point in the history
Drop support for legacy Python 3.4
  • Loading branch information
hugovk committed Dec 29, 2018
2 parents 53806b0 + ee879aa commit 718fba0
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 17 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ matrix:
env: TOXENV=py36
- python: 3.5
env: TOXENV=py35
- python: 3.4
env: TOXENV=py34
- python: pypy3
env: TOXENV=pypy3
- python: 3.8-dev
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Installation
Install via pip:

pip install pylast

Install latest development version:

pip install -U git+https://github.com/pylast/pylast.git
Expand All @@ -29,7 +29,7 @@ Or from requirements.txt:

Note:

* pylast 3.0.0+ supports Python 3.4+ ([#265](https://github.com/pylast/pylast/issues/265))
* pylast 3.0.0+ supports Python 3.5+ ([#265](https://github.com/pylast/pylast/issues/265))
* pyLast 2.2.0 - 2.4.0 supports Python 2.7.10+, 3.4, 3.5, 3.6, 3.7.
* pyLast 2.0.0 - 2.1.0 supports Python 2.7.10+, 3.4, 3.5, 3.6.
* pyLast 1.7.0 - 1.9.0 supports Python 2.7, 3.3, 3.4, 3.5, 3.6.
Expand Down
18 changes: 9 additions & 9 deletions pylast/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
logging.getLogger(__name__).addHandler(logging.NullHandler())


class _Network(object):
class _Network:
"""
A music social network website such as Last.fm or
one with a Last.fm-compatible API.
Expand Down Expand Up @@ -795,7 +795,7 @@ def __repr__(self):
)


class _ShelfCacheBackend(object):
class _ShelfCacheBackend:
"""Used as a backend for caching cacheable requests."""

def __init__(self, file_path=None):
Expand All @@ -816,7 +816,7 @@ def set_xml(self, key, xml_string):
self.shelf[key] = xml_string


class _Request(object):
class _Request:
"""Representing an abstract web service operation."""

def __init__(self, network, method_name, params=None):
Expand Down Expand Up @@ -981,7 +981,7 @@ def _check_response_for_errors(self, response):
raise WSError(self.network, status, details)


class SessionKeyGenerator(object):
class SessionKeyGenerator:
"""Methods of generating a session key:
1) Web Authentication:
a. network = get_*_network(API_KEY, API_SECRET)
Expand Down Expand Up @@ -1104,7 +1104,7 @@ def r(*args):
return r


class _BaseObject(object):
class _BaseObject:
"""An abstract webservices object."""

network = None
Expand Down Expand Up @@ -1193,7 +1193,7 @@ def get_wiki(self, section):
return _extract(node, section)


class _Chartable(object):
class _Chartable:
"""Common functions for classes with charts."""

def __init__(self, ws_prefix):
Expand Down Expand Up @@ -1264,7 +1264,7 @@ def get_weekly_charts(self, chart_kind, from_date=None, to_date=None):
return seq


class _Taggable(object):
class _Taggable:
"""Common functions for classes with tags."""

def __init__(self, ws_prefix):
Expand Down Expand Up @@ -1593,7 +1593,7 @@ class Album(_Opus):
__hash__ = _Opus.__hash__

def __init__(self, artist, title, network, username=None, info=None):
super(Album, self).__init__(artist, title, network, "album", username, info)
super().__init__(artist, title, network, "album", username, info)

def get_tracks(self):
"""Returns the list of Tracks on this album."""
Expand Down Expand Up @@ -2062,7 +2062,7 @@ class Track(_Opus):
__hash__ = _Opus.__hash__

def __init__(self, artist, title, network, username=None, info=None):
super(Track, self).__init__(artist, title, network, "track", username, info)
super().__init__(artist, title, network, "track", username, info)

def get_correction(self):
"""Returns the corrected track name."""
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
version = version_dict["__version__"]


if sys.version_info < (3, 4):
if sys.version_info < (3, 5):
error = """pylast 3.0 and above are no longer compatible with Python 2.
This is pylast {} and you are using Python {}.
Expand Down Expand Up @@ -64,15 +64,14 @@
"Topic :: Multimedia :: Sound/Audio",
"Topic :: Software Development :: Libraries :: Python Modules",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
],
python_requires=">=3.4",
python_requires=">=3.5",
keywords=["Last.fm", "music", "scrobble", "scrobbling"],
packages=find_packages(exclude=("tests*",)),
license="Apache2",
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py37, py36, py35, py34, pypy3, py38dev
envlist = py37, py36, py35, pypy3, py38dev
recreate = False

[testenv]
Expand Down

0 comments on commit 718fba0

Please sign in to comment.