Commit MetaInfo

Révision711a5ebc6565e66232b2a3a78fa60d1e2cc910b5 (tree)
l'heure2022-01-11 22:43:38
AuteurSergey Gusarov <laborer2008@gmai...>
CommiterSergey Gusarov

Message de Log

AccountNumber: Fixed syntax

Change Summary

Modification

diff -r 6845513664f8 -r 711a5ebc6565 src/account_number.py
--- a/src/account_number.py Tue Jan 11 14:26:10 2022 +0300
+++ b/src/account_number.py Tue Jan 11 16:43:38 2022 +0300
@@ -31,7 +31,7 @@
3131 ]
3232
3333 INDEX_START_CURRENCY = 5
34- INDEX_END_CURRENCY = 7
34+ INDEX_END_CURRENCY = 8
3535 INDEX_CHECKSUM = 8
3636
3737 WEIGHT_COEF = [7, 1, 3, 7, 1, 3, 7, 1, 3, 7, 1, 3, 7, 1, 3, 7, 1, 3, 7, 1, 3, 7, 1]
@@ -48,7 +48,7 @@
4848
4949 currencyPart = content[AccountNumber.INDEX_START_CURRENCY:AccountNumber.INDEX_END_CURRENCY]
5050 if currencyPart not in AccountNumber.CURRENCY_PART:
51- raise ValueError('Invalid(unknow currency part) account number: \'' + content + '\'')
51+ raise ValueError('Invalid(unknow currency part \'' + currencyPart + '\'), account number: \'' + content + '\'')
5252
5353 return super().__new__(cls, content)
5454
@@ -65,8 +65,9 @@
6565
6666 checkSum = int(bic[AccountNumber.INDEX_CHECKSUM])
6767
68- commonReq = bic.orgNumber() + self
69- commonReq[Bic.ORG_NUMBER_LENGTH + AccountNumber.INDEX_CHECKSUM] = 0
68+ commonReq = list(bic.orgNumber() + str(self))
69+ checkSumIndex = Bic.ORG_NUMBER_LENGTH + AccountNumber.INDEX_CHECKSUM
70+ commonReq[checkSumIndex] = 0
7071 sum = 0
7172 i = 0
7273 for j in commonReq:
diff -r 6845513664f8 -r 711a5ebc6565 src/bic.py
--- a/src/bic.py Tue Jan 11 14:26:10 2022 +0300
+++ b/src/bic.py Tue Jan 11 16:43:38 2022 +0300
@@ -12,8 +12,8 @@
1212 LENGTH = 9
1313
1414 INDEX_ORG_NUMBER_START = 6
15- INDEX_ORG_NUMBER_END = 8
16- ORG_NUMBER_LENGTH = INDEX_ORG_NUMBER_END - INDEX_ORG_NUMBER_START + 1
15+ INDEX_ORG_NUMBER_END = 9
16+ ORG_NUMBER_LENGTH = INDEX_ORG_NUMBER_END - INDEX_ORG_NUMBER_START
1717
1818 def __new__(cls, content):
1919 if not ((type(content) is str) or (type(content) is Bic)):
@@ -27,4 +27,4 @@
2727 return super().__new__(cls, content)
2828
2929 def orgNumber(self):
30- return self[Bic.INDEX_ORG_NUMBER_START:Bic.INDEX_ORG_NUMBER_END]
30+ return str(self[Bic.INDEX_ORG_NUMBER_START:Bic.INDEX_ORG_NUMBER_END])
diff -r 6845513664f8 -r 711a5ebc6565 src/description.py
--- a/src/description.py Tue Jan 11 14:26:10 2022 +0300
+++ b/src/description.py Tue Jan 11 16:43:38 2022 +0300
@@ -205,7 +205,9 @@
205205 keyWord = self.getKeyWord(firstLineItem, accountName)
206206
207207 if keyWord.startswith(Description.KeyWord.Prefix.ACCOUNT):
208- pass
208+ accountNumber = AccountNumber(lineItems[1])
209+ accountNumber.checkValue(self._bic, accountName)
210+ self._accounts.append(accountNumber)
209211 elif keyWord.startswith(Description.KeyWord.Prefix.CARD):
210212 if lenLineItems == 5:
211213 pin = lineItems[4]
Afficher sur ancien navigateur de dépôt.