Add dg2, dg7 and dg11 #3
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
arosasg
commented
May 18, 2024
•
arosasg
commented
- Added dg2
- Added dg7
- Added dg11
- Restructure ef code
|
Thank you for this PR! I'll be reviewing it shortly. |
|
Check this commit: Do the same on your branch. Library has been changed and therefore it throws few errors. |
Done |
smlu
requested changes
May 30, 2024
src/pymrtd/ef/__init__.py
Outdated
| from .dg2 import DataGroup2 | ||
|
|
||
| from .sod import SOD, SODError | ||
|
|
There was a problem hiding this comment.
Could you revert include style back to original.
src/pymrtd/ef/dg.py
Outdated
| ("aa_info", ActiveAuthenticationInfo), | ||
| ("chip_auth_info", ChipAuthenticationInfo), | ||
| ("chip_auth_pub_key_info", ChipAuthenticationPublicKeyInfo), | ||
| # Note: Missing PACEDomainParameterInfo and PACEInfo |
| 13: "EF.DG13", | ||
| 14: "EF.DG14", | ||
| 15: "EF.DG15", | ||
| 16: "EF.DG16", |
| value = 4 | ||
| elif value not in DataGroupNumber._map: | ||
| raise ValueError('Invalid data group number') | ||
| raise ValueError("Invalid data group number") |
src/pymrtd/ef/dg.py
Outdated
| @@ -178,7 +181,20 @@ def mrz(self) -> MachineReadableZone: | |||
|
|
|||
| @property | |||
| def native(self): | |||
| return { 'mrz': self.mrz.native } | |||
| return {"mrz": self.mrz.native} | |||
Comment on lines
+133
to
+151
| assert mrz.dump() == tv | ||
| assert mrz.type == "td3" | ||
| assert mrz.documentCode == "P" | ||
| assert mrz.country == "D" | ||
| assert mrz.documentNumber == "C11T002JM" | ||
| assert mrz["document_number_cd"] == 4 | ||
| assert mrz["optional_data"] == "" | ||
| assert mrz.additionalData == "" | ||
| assert mrz["optional_data_cd"] == 0 | ||
| assert mrz.dateOfBirth == date(1996, 8, 12) | ||
| assert mrz["date_of_birth_cd"] == 2 | ||
| assert mrz.gender == "F" | ||
| assert mrz.dateOfExpiry == date(2023, 10, 31) | ||
| assert mrz["date_of_expiry_cd"] == 4 | ||
| assert mrz.nationality == "D" | ||
| assert mrz["composite_cd"] == 4 | ||
| assert mrz["name_identifiers"] == ("MUSTERMANN", "ERIKA") | ||
| assert mrz.name == "ERIKA" | ||
| assert mrz.surname == "MUSTERMANN" |
There was a problem hiding this comment.
Nit, align by equal sign to match the original style.
Comment on lines
+153
to
+163
| "type": "td3", | ||
| "doc_code": "P", | ||
| "doc_number": "C11T002JM", | ||
| "date_of_expiry": date(2023, 10, 31), | ||
| "surname": "MUSTERMANN", | ||
| "name": "ERIKA", | ||
| "date_of_birth": date(1996, 8, 12), | ||
| "gender": "F", | ||
| "country": "D", | ||
| "nationality": "D", | ||
| "additional_data": "", |
There was a problem hiding this comment.
Nit, align by equal sign to match the original style.
Comment on lines
+113
to
+123
| "type": "td3", | ||
| "doc_code": "P", | ||
| "doc_number": "L898902C3", | ||
| "date_of_expiry": date(2012, 4, 15), | ||
| "surname": "ERIKSSON", | ||
| "name": "ANNA MARIA", | ||
| "date_of_birth": date(1974, 8, 12), | ||
| "gender": "F", | ||
| "country": "UTO", | ||
| "nationality": "UTO", | ||
| "additional_data": "ZE184226B", |
There was a problem hiding this comment.
Nit, align by equal sign to match the original style.
Comment on lines
+75
to
+85
| "type": "td2", | ||
| "doc_code": "I", | ||
| "doc_number": "D23145890734", | ||
| "date_of_expiry": date(1995, 7, 12), | ||
| "surname": "STEVENSON", | ||
| "name": "PETER JOHN", | ||
| "date_of_birth": date(1934, 7, 12), | ||
| "gender": "M", | ||
| "country": "UTO", | ||
| "nationality": "UTO", | ||
| "additional_data": "", |
There was a problem hiding this comment.
Nit, align by equal sign to match the original style.
Comment on lines
+38
to
+48
| "type": "td1", | ||
| "doc_code": "I", | ||
| "doc_number": "XI85935F8", | ||
| "date_of_expiry": date(2011, 8, 26), | ||
| "surname": "VAN DER STEEN", | ||
| "name": "MARIANNE LOUISE", | ||
| "date_of_birth": date(1972, 8, 14), | ||
| "gender": "F", | ||
| "country": "NLD", | ||
| "nationality": "NLD", | ||
| "additional_data": "999999990", |
There was a problem hiding this comment.
Nit, align by equal sign to match the original style.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.