From df08d3e401ec8efba05e4f3f3f68d9ff229d95f5 Mon Sep 17 00:00:00 2001 From: mutantmonkey Date: Fri, 20 Mar 2015 19:16:39 -0700 Subject: [PATCH] wuvt: remove DJ prefix --- modules/test/test_wuvt.py | 2 +- modules/wuvt.py | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/modules/test/test_wuvt.py b/modules/test/test_wuvt.py index 7cff1fc..9968f30 100644 --- a/modules/test/test_wuvt.py +++ b/modules/test/test_wuvt.py @@ -16,6 +16,6 @@ class TestWuvt(unittest.TestCase): wuvt(self.phenny, None) out = self.phenny.say.call_args[0][0] - m = re.match('^DJ .* is currently playing .* by .*$', out, + m = re.match('^.* is currently playing .* by .*$', out, flags=re.UNICODE) self.assertTrue(m) diff --git a/modules/wuvt.py b/modules/wuvt.py index eece7a6..bc64375 100644 --- a/modules/wuvt.py +++ b/modules/wuvt.py @@ -17,12 +17,8 @@ def wuvt(phenny, input): except: raise GrumbleError("Failed to fetch current track from WUVT") - dj = trackinfo['dj'].strip() - if dj[0:3] != 'DJ ': - dj = 'DJ {}'.format(dj) - phenny.say("{dj} is currently playing {title} by {artist}".format( - dj=dj, + dj=trackinfo['dj'].strip(), title=trackinfo['title'].strip(), artist=trackinfo['artist'].strip())) wuvt.commands = ['wuvt']