From 8a5a2d85144a690a5899c9fb340ea6018c7a7740 Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Sat, 26 Apr 2014 14:32:13 +0200 Subject: [PATCH] Fix missing _() in some cases. ====================================================================== ERROR: test_display_tag_name (test.test_utils.TagsTest) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/travis/build/musicbrainz/picard/test/test_utils.py", line 89, in test_display_tag_name self.assertEqual(dtn('tag'), 'tag') File "/home/travis/build/musicbrainz/picard/picard/util/tags.py", line 106, in display_tag_name return _(name) NameError: global name '_' is not defined --- test/test_utils.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/test_utils.py b/test/test_utils.py index 5dbab82a3..a327f1f22 100644 --- a/test/test_utils.py +++ b/test/test_utils.py @@ -4,6 +4,11 @@ import os.path import unittest from picard import util +import __builtin__ +# ensure _() is defined +if '_' not in __builtin__.__dict__: + __builtin__.__dict__['_'] = lambda a: a + class ReplaceWin32IncompatTest(unittest.TestCase): @@ -82,9 +87,6 @@ class HiddenPathTest(unittest.TestCase): class TagsTest(unittest.TestCase): def test_display_tag_name(self): - def _(s): - return s - dtn = util.tags.display_tag_name self.assertEqual(dtn('tag'), 'tag') self.assertEqual(dtn('tag:desc'), 'tag [desc]')