Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-02-15 20:03:25 +01:00
Code Issues Projects Releases Wiki Activity

add missing bytestring_paths for python -bb

Browse source
This commit is contained in:
Johnny Robeson 2016-07-03 22:24:21 -04:00
parent 31a5292491
commit 35d0e81949
2 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
beets/ui/__init__.py
View file

@ -1208,7 +1208,7 @@ def _configure(options):
def _open_library(config):
"""Create a new library instance from the configuration.
"""
dbpath = config['library'].as_filename()
dbpath = util.bytestring_path(config['library'].as_filename())
try:
lib = library.Library(
dbpath,

40
test/test_ui.py
View file

@ -845,11 +845,11 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions):
ui._raw_main(['--config', cli_config_path, 'test'])
self.assert_equal_path(
config['library'].as_filename(),
util.bytestring_path(config['library'].as_filename()),
os.path.join(self.user_config_dir, b'beets.db')
)
self.assert_equal_path(
config['statefile'].as_filename(),
util.bytestring_path(config['statefile'].as_filename()),
os.path.join(self.user_config_dir, b'state')
)
@ -862,10 +862,14 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions):
file.write('statefile: state')
ui._raw_main(['--config', cli_config_path, 'test'])
self.assert_equal_path(config['library'].as_filename(),
os.path.join(self.beetsdir, b'beets.db'))
self.assert_equal_path(config['statefile'].as_filename(),
os.path.join(self.beetsdir, b'state'))
self.assert_equal_path(
util.bytestring_path(config['library'].as_filename()),
os.path.join(self.beetsdir, b'beets.db')
)
self.assert_equal_path(
util.bytestring_path(config['statefile'].as_filename()),
os.path.join(self.beetsdir, b'state')
)
def test_command_line_option_relative_to_working_dir(self):
os.chdir(self.temp_dir)
@ -911,10 +915,14 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions):
os.environ['BEETSDIR'] = util.py3_path(self.beetsdir)
config.read()
self.assert_equal_path(config['library'].as_filename(),
os.path.join(self.beetsdir, b'library.db'))
self.assert_equal_path(config['statefile'].as_filename(),
os.path.join(self.beetsdir, b'state.pickle'))
self.assert_equal_path(
util.bytestring_path(config['library'].as_filename()),
os.path.join(self.beetsdir, b'library.db')
)
self.assert_equal_path(
util.bytestring_path(config['statefile'].as_filename()),
os.path.join(self.beetsdir, b'state.pickle')
)
def test_beetsdir_config_paths_resolve_relative_to_beetsdir(self):
os.environ['BEETSDIR'] = util.py3_path(self.beetsdir)
@ -925,10 +933,14 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions):
file.write('statefile: state')
config.read()
self.assert_equal_path(config['library'].as_filename(),
os.path.join(self.beetsdir, b'beets.db'))
self.assert_equal_path(config['statefile'].as_filename(),
os.path.join(self.beetsdir, b'state'))
self.assert_equal_path(
util.bytestring_path(config['library'].as_filename()),
os.path.join(self.beetsdir, b'beets.db')
)
self.assert_equal_path(
util.bytestring_path(config['statefile'].as_filename()),
os.path.join(self.beetsdir, b'state')
)
class ShowModelChangeTest(_common.TestCase):