aselimov/pubs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unicode citekey in python2; removes

Browse Source
This commit is contained in:
Fabien C. Y. Benureau 2018-04-10 14:55:55 +09:00
parent c7e9470300
commit 913a5d77b5
5 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pubs/commands/add_cmd.py
View File

@ -32,7 +32,7 @@ def parser(subparsers, conf):
default=None default=None
).completer = CommaSeparatedTagsCompletion(conf) ).completer = CommaSeparatedTagsCompletion(conf)
parser.add_argument('-k', '--citekey', help='citekey associated with the paper;\nif not provided, one will be generated automatically.', parser.add_argument('-k', '--citekey', help='citekey associated with the paper;\nif not provided, one will be generated automatically.',
default=None, type=p3.to_utf8) default=None, type=p3.u_maybe)
parser.add_argument('-L', '--link', action='store_false', dest='copy', default=True, parser.add_argument('-L', '--link', action='store_false', dest='copy', default=True,
help="don't copy document files, just create a link.") help="don't copy document files, just create a link.")
parser.add_argument('-M', '--move', action='store_true', dest='move', default=False, parser.add_argument('-M', '--move', action='store_true', dest='move', default=False,

4
pubs/commands/remove_cmd.py
View File

@ -4,7 +4,7 @@ from .. import repo
from .. import color from .. import color
from ..uis import get_ui from ..uis import get_ui
from ..utils import resolve_citekey_list from ..utils import resolve_citekey_list
from ..p3 import ustr, to_utf8 from ..p3 import ustr, u_maybe
from ..completion import CiteKeyCompletion from ..completion import CiteKeyCompletion
@ -12,7 +12,7 @@ def parser(subparsers, conf):
parser = subparsers.add_parser('remove', help='removes a publication') parser = subparsers.add_parser('remove', help='removes a publication')
parser.add_argument('-f', '--force', action='store_true', default=None, parser.add_argument('-f', '--force', action='store_true', default=None,
help="does not prompt for confirmation.") help="does not prompt for confirmation.")
parser.add_argument('citekeys', nargs='+', type=to_utf8, parser.add_argument('citekeys', nargs='+', type=u_maybe,
help="one or several citekeys", help="one or several citekeys",
).completer = CiteKeyCompletion(conf) ).completer = CiteKeyCompletion(conf)
return parser return parser

6
pubs/p3.py
View File

@ -52,9 +52,6 @@ if sys.version_info[0] == 2:
stdio.seek(0) stdio.seek(0)
return stdio.read() return stdio.read()
def to_utf8(s):
return b(s)
# for details, see http://bugs.python.org/issue9779 # for details, see http://bugs.python.org/issue9779
class ArgumentParser(argparse.ArgumentParser): class ArgumentParser(argparse.ArgumentParser):
def _print_message(self, message, file=None): def _print_message(self, message, file=None):
@ -104,9 +101,6 @@ else:
stdio.seek(0) stdio.seek(0)
return stdio.read() return stdio.read()
def to_utf8(s):
return s
import pickle import pickle
ArgumentParser = argparse.ArgumentParser ArgumentParser = argparse.ArgumentParser

2
pubs/version.py
View File

@ -1 +1 @@
__version__ = '0.8.dev1' __version__ = '0.8.dev2'

7
tests/test_usecase.py
View File

@ -123,9 +123,7 @@ class CommandTestCase(fake_env.TestFakeFs):
actual_err = color.undye(stderr) actual_err = color.undye(stderr)
if expected_out is not None: if expected_out is not None:
self.assertEqual(p3.u_maybe(actual_out), p3.u_maybe(expected_out)) self.assertEqual(p3.u_maybe(actual_out), p3.u_maybe(expected_out))
#self.assertEqual(actual_out, expected_out)
if expected_err is not None: if expected_err is not None:
self.assertEqual(actual_err, expected_err)
self.assertEqual(p3.u_maybe(actual_err), p3.u_maybe(expected_err)) self.assertEqual(p3.u_maybe(actual_err), p3.u_maybe(expected_err))
outs.append(color.undye(actual_out)) outs.append(color.undye(actual_out))
else: else:
@ -201,11 +199,6 @@ class TestAlone(CommandTestCase):
self.execute_cmds(['pubs']) self.execute_cmds(['pubs'])
self.assertEqual(cm.exception.code, 2) self.assertEqual(cm.exception.code, 2)
<<<<<<< HEAD
=======
@unittest.skipIf(sys.version_info.major == 2, "not supported for Python2")
>>>>>>> implement requested changes for #133
def test_alone_prints_help(self): def test_alone_prints_help(self):
# capturing the output of `pubs --help` is difficult because argparse # capturing the output of `pubs --help` is difficult because argparse
# raises as SystemExit(0) after calling `print_help`, and this gets # raises as SystemExit(0) after calling `print_help`, and this gets