Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-14 20:43:41 +01:00
Code Issues Projects Releases Wiki Activity

use py3_path for archive (ZipFile, etc) filenames

Browse source 
ZipFile and RarFile both only accept string filenames on py3, not
bytestrings.
This commit is contained in:
Johnny Robeson 2016-07-02 02:02:21 -04:00
parent 17883bc501
commit f9dfd34602
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
beets/importer.py
View file

@ -944,7 +944,7 @@ class ArchiveImportTask(SentinelImportTask):
return False
for path_test, _ in cls.handlers():
if path_test(path):
if path_test(util.py3_path(path)):
return True
return False
@ -990,7 +990,7 @@ class ArchiveImportTask(SentinelImportTask):
try:
extract_to = mkdtemp()
archive = handler_class(self.toppath, mode='r')
archive = handler_class(util.py3_path(self.toppath), mode='r')
archive.extractall(extract_to)
finally:
archive.close()

8
test/test_importer.py
View file

@ -30,7 +30,7 @@ from mock import patch
from test import _common
from test._common import unittest
from beets.util import displayable_path, bytestring_path
from beets.util import displayable_path, bytestring_path, py3_path
from test.helper import TestImportSession, TestHelper, has_program, capture_log
from beets import importer
from beets.importer import albums_in_dir
@ -355,9 +355,9 @@ class NonAutotaggedImportTest(_common.TestCase, ImportHelper):
def create_archive(session):
(handle, path) = mkstemp(dir=session.temp_dir)
(handle, path) = mkstemp(dir=py3_path(session.temp_dir))
os.close(handle)
archive = ZipFile(path, mode='w')
archive = ZipFile(py3_path(path), mode='w')
archive.write(os.path.join(_common.RSRC, b'full.mp3'),
'full.mp3')
archive.close()
@ -414,7 +414,7 @@ class ImportTarTest(ImportZipTest):
def create_archive(self):
(handle, path) = mkstemp(dir=self.temp_dir)
os.close(handle)
archive = TarFile(path, mode='w')
archive = TarFile(py3_path(path), mode='w')
archive.add(os.path.join(_common.RSRC, b'full.mp3'),
'full.mp3')
archive.close()