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

PEP8 cosmetics.

Browse Source
This commit is contained in:
Olivier Mangin 2018-01-25 22:33:14 -05:00
parent 328f2a6d5e
commit 0b1ff7e441
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pubs/bibstruct.py
View File

@ -12,8 +12,9 @@ TYPE_KEY = 'type'
CONTROL_CHARS = ''.join(map(uchr, list(range(0, 32)) + list(range(127, 160)))) CONTROL_CHARS = ''.join(map(uchr, list(range(0, 32)) + list(range(127, 160))))
CITEKEY_FORBIDDEN_CHARS = '@\'\\,#}{~%/ ' # '/' is OK for bibtex but forbidden CITEKEY_FORBIDDEN_CHARS = '@\'\\,#}{~%/ ' # '/' is OK for bibtex but forbidden
# here since we transform citekeys into filenames # here since we transform citekeys into filenames
CITEKEY_EXCLUDE_RE = re.compile('[%s]' CITEKEY_EXCLUDE_RE = re.compile(
% re.escape(CONTROL_CHARS + CITEKEY_FORBIDDEN_CHARS)) '[%s]' % re.escape(CONTROL_CHARS + CITEKEY_FORBIDDEN_CHARS))
def str2citekey(s): def str2citekey(s):
key = unicodedata.normalize('NFKD', ustr(s)).encode('ascii', 'ignore').decode() key = unicodedata.normalize('NFKD', ustr(s)).encode('ascii', 'ignore').decode()
@ -21,6 +22,7 @@ def str2citekey(s):
# Normalize chars and remove non-ascii # Normalize chars and remove non-ascii
return key return key
def check_citekey(citekey): def check_citekey(citekey):
if citekey is None or not citekey.strip(): if citekey is None or not citekey.strip():
raise ValueError(u"Empty citekeys are not valid") raise ValueError(u"Empty citekeys are not valid")
@ -30,25 +32,30 @@ def check_citekey(citekey):
u"utf-8 citekeys are not supported yet.\n" u"utf-8 citekeys are not supported yet.\n"
u"See https://github.com/pubs/pubs/issues/28 for details.") u"See https://github.com/pubs/pubs/issues/28 for details.")
def verify_bibdata(bibdata): def verify_bibdata(bibdata):
if bibdata is None or len(bibdata) == 0: if bibdata is None or len(bibdata) == 0:
raise ValueError(u"no valid bibdata") raise ValueError(u"no valid bibdata")
if len(bibdata) > 1: if len(bibdata) > 1:
raise ValueError(u"ambiguous: multiple entries in the bibdata.") raise ValueError(u"ambiguous: multiple entries in the bibdata.")
def get_entry(bibdata): def get_entry(bibdata):
verify_bibdata(bibdata) verify_bibdata(bibdata)
for e in bibdata.items(): for e in bibdata.items():
return e return e
def extract_citekey(bibdata): def extract_citekey(bibdata):
citekey, entry = get_entry(bibdata) citekey, entry = get_entry(bibdata)
return citekey return citekey
def author_last(author_str): def author_last(author_str):
""" Return the last name of the author """ """ Return the last name of the author """
return author_str.split(',')[0] return author_str.split(',')[0]
def generate_citekey(bibdata): def generate_citekey(bibdata):
""" Generate a citekey from bib_data. """ Generate a citekey from bib_data.
@ -62,7 +69,7 @@ def generate_citekey(bibdata):
first_author = entry[author_key][0] first_author = entry[author_key][0]
except KeyError: except KeyError:
raise ValueError( raise ValueError(
u"No author or editor defined: cannot generate a citekey.") u"No author or editor defined: cannot generate a citekey.")
try: try:
year = entry['year'] year = entry['year']
except KeyError: except KeyError:
@ -71,6 +78,7 @@ def generate_citekey(bibdata):
return str2citekey(citekey) return str2citekey(citekey)
def extract_docfile(bibdata, remove=False): def extract_docfile(bibdata, remove=False):
""" Try extracting document file from bib data. """ Try extracting document file from bib data.
Returns None if not found. Returns None if not found.