From ef7a80865f253852f7c7b01f04bc02b695ead67b Mon Sep 17 00:00:00 2001 From: Thibaut Horel Date: Sun, 29 Sep 2013 17:48:14 -0400 Subject: Giving up on Python 2.5 support --- lastfm.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lastfm.py') diff --git a/lastfm.py b/lastfm.py index 60781d5..dca9628 100644 --- a/lastfm.py +++ b/lastfm.py @@ -1,8 +1,6 @@ -from __future__ import with_statement import requests import sys -import simplejson as json from time import sleep from collections import deque from types import * @@ -25,7 +23,7 @@ def make_request(method, payload): r = requests.get(URL, params=params, headers=user_agent) try: - answer = json.loads(r.text) + answer = r.json() except ValueError: # request failed for some reason, retrying i = 0 while r.status_code == 503 and i < 3: @@ -33,7 +31,7 @@ def make_request(method, payload): r = requests.get(URL, params=params, headers=user_agent) i += 1 try: - answer = json.loads(r.text) + answer = r.json() except ValueError: # giving up answer = None -- cgit v1.2.3-70-g09d2