efj-parser 0.9.1__tar.gz → 0.9.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {efj-parser-0.9.1 → efj_parser-0.9.2}/PKG-INFO +1 -1
- {efj-parser-0.9.1 → efj_parser-0.9.2}/efj_parser/__init__.py +1 -1
- {efj-parser-0.9.1 → efj_parser-0.9.2}/efj_parser.egg-info/PKG-INFO +1 -1
- {efj-parser-0.9.1 → efj_parser-0.9.2}/setup.py +1 -1
- {efj-parser-0.9.1 → efj_parser-0.9.2}/tests/test_parser.py +6 -6
- {efj-parser-0.9.1 → efj_parser-0.9.2}/LICENSE +0 -0
- {efj-parser-0.9.1 → efj_parser-0.9.2}/README.md +0 -0
- {efj-parser-0.9.1 → efj_parser-0.9.2}/efj_parser/py.typed +0 -0
- {efj-parser-0.9.1 → efj_parser-0.9.2}/efj_parser.egg-info/SOURCES.txt +0 -0
- {efj-parser-0.9.1 → efj_parser-0.9.2}/efj_parser.egg-info/dependency_links.txt +0 -0
- {efj-parser-0.9.1 → efj_parser-0.9.2}/efj_parser.egg-info/top_level.txt +0 -0
- {efj-parser-0.9.1 → efj_parser-0.9.2}/pyproject.toml +0 -0
- {efj-parser-0.9.1 → efj_parser-0.9.2}/setup.cfg +0 -0
|
@@ -248,7 +248,7 @@ class Parser():
|
|
|
248
248
|
self.__parse_nextdate, "short_date"),
|
|
249
249
|
(re.compile(r"\A(\d{4})/(\d{4})([^#]*)(#.+)?\Z"),
|
|
250
250
|
self.__parse_duty, "duty"),
|
|
251
|
-
(re.compile(r"(
|
|
251
|
+
(re.compile(r"([-\w]{2,10})\s*:\s*([-\w]+)"),
|
|
252
252
|
self.__parse_aircraft, "aircraft"),
|
|
253
253
|
(re.compile(r"\{([^}]*)}\Z"),
|
|
254
254
|
self.__parse_crewlist, "crewlist"),
|
|
@@ -10,14 +10,14 @@ class TestParser(unittest.TestCase):
|
|
|
10
10
|
data = """\
|
|
11
11
|
2024-01-21
|
|
12
12
|
1000/1430
|
|
13
|
-
|
|
13
|
+
N1:320
|
|
14
14
|
{FO: Bloggs}
|
|
15
15
|
BRS/BFS 1100/1200 ins #belfast
|
|
16
16
|
/ 1300/1400 ins:20 test spme
|
|
17
17
|
{}
|
|
18
18
|
+
|
|
19
19
|
1000/1610 # Comment
|
|
20
|
-
|
|
20
|
+
OB-T-1274:A-321
|
|
21
21
|
/NCE 1100/1300 ld:3
|
|
22
22
|
/ 1340/1540 v:30 n:10 ln
|
|
23
23
|
|
|
@@ -47,7 +47,7 @@ G-EFGH:321
|
|
|
47
47
|
efj.Roles(p1=60, instructor=60),
|
|
48
48
|
efj.Conditions(ifr=60),
|
|
49
49
|
efj.Landings(day=1),
|
|
50
|
-
efj.Aircraft("
|
|
50
|
+
efj.Aircraft("N1", "320"),
|
|
51
51
|
efj.Airports("BRS", "BFS"),
|
|
52
52
|
"Self", (), "belfast",
|
|
53
53
|
(efj.Crewmember("FO", "Bloggs"),)),
|
|
@@ -56,7 +56,7 @@ G-EFGH:321
|
|
|
56
56
|
efj.Roles(p1=60, instructor=20),
|
|
57
57
|
efj.Conditions(ifr=60),
|
|
58
58
|
efj.Landings(day=1),
|
|
59
|
-
efj.Aircraft("
|
|
59
|
+
efj.Aircraft("N1", "320", "spme"),
|
|
60
60
|
efj.Airports("BFS", "BRS"),
|
|
61
61
|
"Self", ("test",), "",
|
|
62
62
|
(efj.Crewmember("FO", "Bloggs"),)),
|
|
@@ -65,7 +65,7 @@ G-EFGH:321
|
|
|
65
65
|
efj.Roles(p1=120),
|
|
66
66
|
efj.Conditions(ifr=120),
|
|
67
67
|
efj.Landings(day=3),
|
|
68
|
-
efj.Aircraft("
|
|
68
|
+
efj.Aircraft("OB-T-1274", "A-321"),
|
|
69
69
|
efj.Airports("BRS", "NCE"),
|
|
70
70
|
"Self", (), "", ()),
|
|
71
71
|
efj.Sector(
|
|
@@ -73,7 +73,7 @@ G-EFGH:321
|
|
|
73
73
|
efj.Roles(p1=120),
|
|
74
74
|
efj.Conditions(night=10, ifr=90),
|
|
75
75
|
efj.Landings(night=1),
|
|
76
|
-
efj.Aircraft("
|
|
76
|
+
efj.Aircraft("OB-T-1274", "A-321"),
|
|
77
77
|
efj.Airports("NCE", "BRS"),
|
|
78
78
|
"Self", (), "", ()))
|
|
79
79
|
self.assertEqual(
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|