Skip to content

Commit babf29a

Browse files
committed
Simplify BibTeX module imports
1 parent 2eda4d4 commit babf29a

20 files changed

Lines changed: 23 additions & 37 deletions

File tree

src/notebook/bibtex/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
from .author import BibAuthor
2+
from .entry import BibEntry, BibEntryType, BibFieldAnnotation
3+
from .parsing import parse_bibtex, parse_value
4+
from .string import BibString, CompositeString, CompositeStringBuilder, VerbatimString, strip_braces

src/notebook/commands/bibtools/formatting.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
import loguru
66
from stdnum import isbn, issn
77

8-
from ...bibtex.author import BibAuthor
9-
from ...bibtex.entry import BibEntry
10-
from ...bibtex.parsing import parse_bibtex
11-
from ...bibtex.string import BibString
8+
from ...bibtex import BibAuthor, BibEntry, BibString, parse_bibtex
129
from ...parsing.parser import ParserError
1310
from ..common.names import latinize_cyrillic_name
1411
from . import url_templates

src/notebook/commands/bibtools/sources/arxiv/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .....bibtex.entry import BibEntry
1+
from .....bibtex import BibEntry
22
from ...exceptions import BibToolsError
33
from ..common.url_template import UrlTemplate
44
from .bib import arxiv_entry_to_bib

src/notebook/commands/bibtools/sources/arxiv/bib.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import re
22

3-
from .....bibtex.entry import BibEntry
3+
from .....bibtex import BibEntry
44
from .....support.unicode import normalize_whitespace
55
from ... import url_templates
66
from ..common.entries import generate_entry_name

src/notebook/commands/bibtools/sources/arxiv/test_bib.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import pytest
22
from xsdata.exceptions import ParserError
33

4-
from .....bibtex.author import BibAuthor
5-
from .....bibtex.entry import BibEntry
4+
from .....bibtex import BibAuthor, BibEntry
65
from .bib import arxiv_entry_to_bib
76
from .fixtures import get_arxiv_fixture_path
87
from .model import parse_arxiv_xml

src/notebook/commands/bibtools/sources/common/entries.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import re
22
from collections.abc import Iterable, Sequence
33

4-
from .....bibtex.author import BibAuthor
5-
from .....bibtex.entry import BibEntry
6-
from .....bibtex.string import strip_braces
4+
from .....bibtex import BibAuthor, BibEntry, strip_braces
75
from .....math.nlp.phrases import Phrase
86
from .....math.nlp.rake import RakeNoPhrasesError
97
from .....support.iteration import string_accumulator

src/notebook/commands/bibtools/sources/common/languages.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
from iso639 import Lang
22
from iso639.exceptions import InvalidLanguageValue
33

4-
from .....bibtex.entry import BibEntry
5-
from .....bibtex.string import BibString, strip_braces
4+
from .....bibtex import BibEntry, BibString, strip_braces
65
from ...exceptions import BibToolsParsingError
76

87

src/notebook/commands/bibtools/sources/common/names.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
from nameparser import HumanName
22

3-
from .....bibtex.author import BibAuthor
4-
from .....bibtex.parsing import parse_value
5-
from .....bibtex.string import BibString
3+
from .....bibtex import BibAuthor, BibString, parse_value
64

75

86
def normalize_human_name(full_name: BibString) -> BibString:

src/notebook/commands/bibtools/sources/doi/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .....bibtex.entry import BibEntry
1+
from .....bibtex import BibEntry
22
from ..common.url_template import UrlTemplate
33
from .bib import doi_data_to_bib
44
from .fetch import fetch_doi_json

src/notebook/commands/bibtools/sources/doi/bib.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
from nameparser import HumanName
44
from stdnum import isbn, issn
55

6-
from .....bibtex.author import BibAuthor
7-
from .....bibtex.entry import BibEntry, BibEntryType
6+
from .....bibtex import BibAuthor, BibEntry, BibEntryType
87
from .....exceptions import UnreachableException
98
from .....support.unicode import normalize_whitespace
109
from ..common.entries import generate_entry_name

0 commit comments

Comments
 (0)