Skip to content

Commit f69ea87

Browse files
author
Gerit Wagner
committed
extract platforms to subpackages
1 parent 62c6c73 commit f69ea87

25 files changed

+65
-50
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ docs/__pycache__/
22
search_query/__pycache__/*
33
test/__pycache__/*
44
docs/build
5+
search_query/ebsco/__pycache__/*
6+
search_query/pubmed/__pycache__/*
7+
search_query/wos/__pycache__/*

search_query/ebsco/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
"""Top-level package for EBSCOHost."""
2+
3+
__author__ = """Gerit Wagner"""
4+
__email__ = "gerit.wagner@hec.ca"
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
from search_query.constants import QueryErrorCode
99
from search_query.constants import TokenTypes
10-
from search_query.constants_ebsco import VALID_FIELDS_REGEX
10+
from search_query.ebsco.constants import VALID_FIELDS_REGEX
1111
from search_query.linter_base import QueryStringLinter
1212

1313
if typing.TYPE_CHECKING:
14-
import search_query.parser_ebsco
14+
import search_query.parser.constants
1515
from search_query.query import Query
1616

1717

@@ -53,9 +53,9 @@ class EBSCOQueryStringLinter(QueryStringLinter):
5353
],
5454
}
5555

56-
parser: search_query.parser_ebsco.EBSCOParser
56+
parser: search_query.parser.constants.EBSCOParser
5757

58-
def __init__(self, parser: search_query.parser_ebsco.EBSCOParser):
58+
def __init__(self, parser: search_query.parser.constants.EBSCOParser):
5959
self.search_str = parser.query_str
6060
self.parser = parser
6161
super().__init__(parser=parser)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
from search_query.constants import QueryErrorCode
1212
from search_query.constants import Token
1313
from search_query.constants import TokenTypes
14+
from search_query.ebsco.linter import EBSCOQueryStringLinter
1415
from search_query.linter_base import QueryListLinter
15-
from search_query.linter_ebsco import EBSCOQueryStringLinter
1616
from search_query.parser_base import QueryListParser
1717
from search_query.parser_base import QueryStringParser
1818
from search_query.query import Query
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
"""EBSCO query translator."""
3-
from search_query.constants_ebsco import generic_search_field_to_syntax_field
4-
from search_query.constants_ebsco import syntax_str_to_generic_search_field_set
3+
from search_query.ebsco.constants import generic_search_field_to_syntax_field
4+
from search_query.ebsco.constants import syntax_str_to_generic_search_field_set
55
from search_query.query import Query
66
from search_query.translator_base import QueryTranslator
77

search_query/parser.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
from search_query.constants import LinterMode
88
from search_query.constants import PLATFORM
9-
from search_query.parser_ebsco import EBSCOListParser
10-
from search_query.parser_ebsco import EBSCOParser
11-
from search_query.parser_pubmed import PubmedListParser
12-
from search_query.parser_pubmed import PubmedParser
13-
from search_query.parser_wos import WOSListParser
14-
from search_query.parser_wos import WOSParser
9+
from search_query.ebsco.parser import EBSCOListParser
10+
from search_query.ebsco.parser import EBSCOParser
11+
from search_query.pubmed.parser import PubmedListParser
12+
from search_query.pubmed.parser import PubmedParser
1513
from search_query.query import Query
14+
from search_query.wos.parser import WOSListParser
15+
from search_query.wos.parser import WOSParser
1616

1717
if typing.TYPE_CHECKING:
1818
from search_query.parser_base import QueryListParser

search_query/pubmed/__init__.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
"""Top-level package for PubMed."""
2+
3+
__author__ = """Gerit Wagner"""
4+
__email__ = "gerit.wagner@hec.ca"

0 commit comments

Comments
 (0)