Skip to content

Commit 16d4ac8

Browse files
committed
Fixed some imports in helpers.py
1 parent f4d6022 commit 16d4ac8

File tree

1 file changed

+21
-23
lines changed

1 file changed

+21
-23
lines changed

headphones/helpers.py

+21-23
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@
1414
# You should have received a copy of the GNU General Public License
1515
# along with Headphones. If not, see <http://www.gnu.org/licenses/>.
1616

17-
from operator import itemgetter
18-
import unicodedata
19-
import datetime
17+
import os
18+
import re
2019
import shutil
21-
import time
2220
import sys
2321
import tempfile
24-
import glob
25-
26-
from beets import logging as beetslogging
27-
import six
22+
import time
23+
import unicodedata
2824
from contextlib import contextmanager
25+
from datetime import datetime, date
26+
from fnmatch import fnmatch
27+
from functools import cmp_to_key
28+
from glob import glob
29+
from operator import itemgetter
2930

30-
import fnmatch
31-
import functools
32-
import re
33-
import os
31+
from beets import logging as beetslogging
3432
from mediafile import MediaFile, FileTypeError, UnreadableFileError
33+
from six import text_type
3534
from unidecode import unidecode
35+
3636
import headphones
3737

3838

@@ -74,7 +74,7 @@ def comparer(left, right):
7474
else:
7575
return 0
7676

77-
return sorted(items, key=functools.cmp_to_key(comparer))
77+
return sorted(items, key=cmp_to_key(comparer))
7878

7979

8080
def checked(variable):
@@ -156,21 +156,19 @@ def convert_seconds(s):
156156

157157

158158
def today():
159-
today = datetime.date.today()
160-
yyyymmdd = datetime.date.isoformat(today)
161-
return yyyymmdd
159+
return date.isoformat(date.today())
162160

163161

164162
def now():
165-
now = datetime.datetime.now()
163+
now = datetime.now()
166164
return now.strftime("%Y-%m-%d %H:%M:%S")
167165

168166

169-
def is_valid_date(date):
170-
if not date:
167+
def is_valid_date(d):
168+
if not d:
171169
return False
172170
else:
173-
return bool(re.match(r'\d{4}-\d{2}-\d{2}', date))
171+
return bool(re.match(r'\d{4}-\d{2}-\d{2}', d))
174172

175173

176174
def age(d):
@@ -508,7 +506,7 @@ def path_match_patterns(path, patterns):
508506
"""
509507

510508
for pattern in patterns:
511-
if fnmatch.fnmatch(path, pattern):
509+
if fnmatch(path, pattern):
512510
return True
513511

514512
# No match
@@ -714,7 +712,7 @@ def preserve_torrent_directory(albumpath, forced=False, single=False):
714712
workdir = os.path.join(tempdir, prefix)
715713
workdir = re.sub(r'\[', '[[]', workdir)
716714
workdir = re.sub(r'(?<!\[)\]', '[]]', workdir)
717-
if len(glob.glob(workdir + '*/')) >= 3:
715+
if len(glob(workdir + '*/')) >= 3:
718716
logger.error(
719717
"Looks like a temp directory has previously been created "
720718
"for this albumpath, not continuing "
@@ -1033,7 +1031,7 @@ def __init__(self):
10331031
self.messages = []
10341032

10351033
def emit(self, record):
1036-
self.messages.append(six.text_type(record.msg))
1034+
self.messages.append(text_type(record.msg))
10371035

10381036

10391037
@contextmanager

0 commit comments

Comments
 (0)