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

Merge pull request #250 from pubs/fix/note_expanduser

Browse Source 
Fix #249: ~ expansion in filebroker.DocBroker
This commit is contained in:
Fabien C. Y. Benureau 2021-01-13 09:42:33 +09:00 committed by GitHub
commit f3dace4987
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pubs/filebroker.py
View File

@ -154,7 +154,7 @@ class DocBroker(object):
def __init__(self, directory, scheme='docsdir', subdir='doc'): def __init__(self, directory, scheme='docsdir', subdir='doc'):
self.scheme = scheme self.scheme = scheme
self.docdir = os.path.join(directory, subdir) self.docdir = os.path.expanduser(os.path.join(directory, subdir))
if not check_directory(self.docdir, fail=False): if not check_directory(self.docdir, fail=False):
os.mkdir(system_path(self.docdir)) os.mkdir(system_path(self.docdir))

10
tests/test_filebroker.py
View File

@ -71,6 +71,16 @@ class TestFileBroker(fake_env.TestFakeFs):
class TestDocBroker(fake_env.TestFakeFs): class TestDocBroker(fake_env.TestFakeFs):
def test_expanduser(self):
"""Test that real_docpath expand the user ~"""
self.fs.add_real_directory(os.path.join(self.rootpath, 'data'), read_only=False)
fb = filebroker.FileBroker('~/testrepo', create = True)
docb = filebroker.DocBroker('~/testrepo')
self.assertTrue(os.path.isabs(docb.docdir))
self.assertTrue(os.path.isabs(docb.real_docpath('docsdir://abc')))
def test_doccopy(self): def test_doccopy(self):
self.fs.add_real_directory(os.path.join(self.rootpath, 'data'), read_only=False) self.fs.add_real_directory(os.path.join(self.rootpath, 'data'), read_only=False)