code adjustments according to pep8

This commit is contained in:
Mike Fährmann
2017-01-30 19:40:15 +01:00
parent 8e93633319
commit 4f123b8513
19 changed files with 103 additions and 34 deletions

View File

@@ -14,10 +14,12 @@ import os.path
import html
import urllib.parse
def remove_html(text):
"""Remove html-tags from a string"""
return " ".join(re.sub("<[^>]+?>", " ", text).split())
def filename_from_url(url):
"""Extract the last part of an url to use as a filename"""
try:
@@ -27,8 +29,9 @@ def filename_from_url(url):
except ValueError:
return url
def nameext_from_url(url, data=None):
"""Extract the last part of an url and fill keywords of 'data' accordingly"""
"""Extract the last part of an url and fill 'data' accordingly"""
if data is None:
data = {}
data["filename"] = unquote(filename_from_url(url))
@@ -36,6 +39,7 @@ def nameext_from_url(url, data=None):
data["extension"] = ext[1:].lower()
return data
def clean_path_windows(path):
"""Remove illegal characters from a path-segment (Windows)"""
try:
@@ -43,6 +47,7 @@ def clean_path_windows(path):
except TypeError:
return path
def clean_path_posix(path):
"""Remove illegal characters from a path-segment (Posix)"""
try:
@@ -50,17 +55,20 @@ def clean_path_posix(path):
except AttributeError:
return path
def shorten_path(path, limit=255, encoding=sys.getfilesystemencoding()):
"""Shorten a path segment to at most 'limit' bytes"""
return (path.encode(encoding)[:limit]).decode(encoding, "ignore")
def shorten_filename(filename, limit=255, encoding=sys.getfilesystemencoding()):
"""Shorten a filename to at most 'limit' bytes while preserving extension"""
name, extension = os.path.splitext(filename)
def shorten_filename(fname, limit=255, encoding=sys.getfilesystemencoding()):
"""Shorten filename to at most 'limit' bytes while preserving extension"""
name, extension = os.path.splitext(fname)
bext = extension.encode(encoding)
bname = name.encode(encoding)[:limit-len(bext)]
return bname.decode(encoding, "ignore") + extension
def extract(txt, begin, end, pos=0):
"""Extract the text between 'begin' and 'end' from 'txt'
@@ -88,6 +96,7 @@ def extract(txt, begin, end, pos=0):
except ValueError:
return None, pos
def extract_all(txt, rules, pos=0, values=None):
"""Calls extract for each rule and returns the result in a dict"""
if values is None:
@@ -98,6 +107,7 @@ def extract_all(txt, rules, pos=0, values=None):
values[key] = result
return values, pos
def extract_iter(txt, begin, end, pos=0):
"""Yield all values obtained by repeated calls to text.extract"""
while True:
@@ -106,6 +116,7 @@ def extract_iter(txt, begin, end, pos=0):
return
yield value
if os.name == "nt":
clean_path = clean_path_windows
else: