Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13271 from cpennington/dont-translate-passthrough

Browse Source 
Don't use optparse's bad translation strings in passthrough_opts
This commit is contained in:
Calen Pennington
2016-08-23 13:23:21 -04:00
committed by GitHub
parent ea0f08d6f2 abe6ef4525
commit fae18fd5e2
1 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
pavelib/utils/passthrough_opts.py
View File

@@ -13,15 +13,6 @@ import paver.tasks
from mock import patch
try:
from gettext import gettext
except ImportError:
def gettext(message):
"""Dummy gettext"""
return message
_ = gettext
class PassthroughOptionParser(OptionParser):
"""
An :class:`optparse.OptionParser` which captures any unknown options into
@@ -66,9 +57,9 @@ class PassthroughOptionParser(OptionParser):
if len(rargs) < nargs:
if nargs == 1:
self.error(_("%s option requires an argument") % opt)
self.error("%s option requires an argument" % opt)
else:
self.error(_("%s option requires %d arguments")
self.error("%s option requires %d arguments"
% (opt, nargs))
elif nargs == 1:
value = rargs.pop(0)
@@ -77,7 +68,7 @@ class PassthroughOptionParser(OptionParser):
del rargs[0:nargs]
elif had_explicit_value:
self.error(_("%s option does not take a value") % opt)
self.error("%s option does not take a value" % opt)
else:
value = None
@@ -111,9 +102,9 @@ class PassthroughOptionParser(OptionParser):
nargs = option.nargs
if len(rargs) < nargs:
if nargs == 1:
self.error(_("%s option requires an argument") % opt)
self.error("%s option requires an argument" % opt)
else:
self.error(_("%s option requires %d arguments")
self.error("%s option requires %d arguments"
% (opt, nargs))
elif nargs == 1: