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

fix for utf8 citekeys

Browse Source
This commit is contained in:
Fabien C. Y. Benureau 2018-03-22 13:48:01 +09:00
parent 9a6db894d8
commit 38133fc053
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pubs/bibstruct.py
View File

@ -26,11 +26,6 @@ def str2citekey(s):
def check_citekey(citekey): def check_citekey(citekey):
if citekey is None or not citekey.strip(): if citekey is None or not citekey.strip():
raise ValueError(u"Empty citekeys are not valid") raise ValueError(u"Empty citekeys are not valid")
# TODO This is not the right way to test that (17/12/2012)
if ustr(citekey) != str2citekey(citekey):
raise ValueError(u"Invalid `{}` citekey; ".format(citekey) +
u"utf-8 citekeys are not supported yet.\n"
u"See https://github.com/pubs/pubs/issues/28 for details.")
def verify_bibdata(bibdata): def verify_bibdata(bibdata):

1
tests/fake_env.py
View File

@ -39,7 +39,6 @@ def redirect(f):
# Test helpers # Test helpers
# automating input # automating input
real_input = input real_input = input

21
tests/test_usecase.py
View File

@ -276,14 +276,18 @@ class TestAdd(URLContentTestCase):
self.assertEqual(set(os.listdir(bib_dir)), {'CustomCitekey.bib'}) self.assertEqual(set(os.listdir(bib_dir)), {'CustomCitekey.bib'})
def test_add_utf8_citekey(self): def test_add_utf8_citekey(self):
err = ("error: Invalid `hausdorff1949grundzüge` citekey; " correct = ["",
"utf-8 citekeys are not supported yet.\n" ("added to pubs:\n"
"See https://github.com/pubs/pubs/issues/28 for details.") # actually not checked "[hausdorff1949grundzüge] Hausdorff, Felix \"Grundzüge der Mengenlehre\" (1949) \n"),
"The 'hausdorff1949grundzüge' citekey has been renamed into 'アスキー'\n",
"The 'アスキー' citekey has been renamed into 'Ḽơᶉëᶆ_ȋṕšᶙṁ'\n"
]
cmds = ['pubs init', cmds = ['pubs init',
('pubs add bibexamples/utf8.bib', [], '', err), ('pubs add bibexamples/utf8.bib', [], correct[1]),
('pubs rename hausdorff1949grundzüge アスキー', [], correct[2]),
('pubs rename アスキー Ḽơᶉëᶆ_ȋṕšᶙṁ', [], correct[3]),
] ]
with self.assertRaises(FakeSystemExit): self.execute_cmds(cmds)
self.execute_cmds(cmds)
def test_add_doc_nocopy_does_not_copy(self): def test_add_doc_nocopy_does_not_copy(self):
cmds = ['pubs init', cmds = ['pubs init',
@ -350,10 +354,11 @@ class TestList(DataCommandTestCase):
self.assertEqual(0, len(outs[1].splitlines())) self.assertEqual(0, len(outs[1].splitlines()))
self.assertEqual(1, len(outs[3].splitlines())) self.assertEqual(1, len(outs[3].splitlines()))
@unittest.expectedFailure #FIXME pyfakefs's shutil.rmtree seems to have problems: submit an issue.
def test_list_several_no_date(self): def test_list_several_no_date(self):
self.execute_cmds(['pubs init -p testrepo']) self.execute_cmds(['pubs init -p testrepo'])
shutil.rmtree('testrepo') os.chdir('/') # weird fix for shutil.rmtree invocation.
shutil.rmtree(self.rootpath + '/testrepo')
os.chdir(self.rootpath)
self.fs.add_real_directory(os.path.join(self.rootpath, 'testrepo'), read_only=False) self.fs.add_real_directory(os.path.join(self.rootpath, 'testrepo'), read_only=False)
#fake_env.copy_dir(self.fs, testrepo, 'testrepo') #fake_env.copy_dir(self.fs, testrepo, 'testrepo')