Skip to content

Commit

Permalink
Remove caching from artist files
Browse files Browse the repository at this point in the history
  • Loading branch information
rsh7 committed Jun 4, 2018
1 parent 14b2a0c commit b7b8802
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
9 changes: 2 additions & 7 deletions brainzutils/musicbrainz_db/artist.py
@@ -1,8 +1,7 @@
from collections import defaultdict
from sqlalchemy.orm import joinedload
from mbdata import models
from brainzutils import cache
from brainzutils.musicbrainz_db import mb_session, DEFAULT_CACHE_EXPIRATION
from brainzutils.musicbrainz_db import mb_session
from brainzutils.musicbrainz_db.helpers import get_relationship_info
from brainzutils.musicbrainz_db.utils import get_entities_by_gids
from brainzutils.musicbrainz_db.serialize import serialize_artists
Expand All @@ -16,11 +15,7 @@ def get_artist_by_id(mbid):
Returns:
Dictionary containing the artist information
"""
key = cache.gen_key(mbid)
artist = cache.get(key)
if not artist:
artist = _get_artist_by_id(mbid)
cache.set(key=key, val=artist, time=DEFAULT_CACHE_EXPIRATION)
artist = _get_artist_by_id(mbid)
return artist


Expand Down
2 changes: 0 additions & 2 deletions brainzutils/musicbrainz_db/tests/test_artist.py
Expand Up @@ -2,13 +2,11 @@
from mock import MagicMock
from brainzutils.musicbrainz_db.test_data import artist_linkin_park, artist_jay_z
from brainzutils.musicbrainz_db import artist as mb_artist
from brainzutils.musicbrainz_db.tests import setup_cache


class ArtistTestCase(TestCase):

def setUp(self):
setup_cache()
mb_artist.mb_session = MagicMock()
self.mock_db = mb_artist.mb_session.return_value.__enter__.return_value
self.artist_query = self.mock_db.query.return_value.options.return_value.filter.return_value.all
Expand Down

0 comments on commit b7b8802

Please sign in to comment.