mirror of
				https://github.com/brain-tec/account_ebics.git
				synced 2025-11-04 07:00:35 +00:00 
			
		
		
		
	[13.0]try/except in init3
This commit is contained in:
		@@ -379,20 +379,39 @@ class EbicsUserID(models.Model):
 | 
				
			|||||||
        if self.state != 'get_bank_keys':
 | 
					        if self.state != 'get_bank_keys':
 | 
				
			||||||
            raise UserError(
 | 
					            raise UserError(
 | 
				
			||||||
                _("Set state to 'Get Keys from Bank'."))
 | 
					                _("Set state to 'Get Keys from Bank'."))
 | 
				
			||||||
        keyring = EbicsKeyRing(
 | 
					        try:
 | 
				
			||||||
            keys=self.ebics_keys_fn, passphrase=self.ebics_passphrase)
 | 
					            keyring = EbicsKeyRing(
 | 
				
			||||||
        bank = EbicsBank(
 | 
					                keys=self.ebics_keys_fn, passphrase=self.ebics_passphrase)
 | 
				
			||||||
            keyring=keyring,
 | 
					            bank = EbicsBank(
 | 
				
			||||||
            hostid=self.ebics_config_id.ebics_host,
 | 
					                keyring=keyring,
 | 
				
			||||||
            url=self.ebics_config_id.ebics_url)
 | 
					                hostid=self.ebics_config_id.ebics_host,
 | 
				
			||||||
        user = EbicsUser(
 | 
					                url=self.ebics_config_id.ebics_url)
 | 
				
			||||||
            keyring=keyring,
 | 
					            user = EbicsUser(
 | 
				
			||||||
            partnerid=self.ebics_config_id.ebics_partner,
 | 
					                keyring=keyring,
 | 
				
			||||||
            userid=self.name)
 | 
					                partnerid=self.ebics_config_id.ebics_partner,
 | 
				
			||||||
        client = EbicsClient(
 | 
					                userid=self.name)
 | 
				
			||||||
            bank, user, version=self.ebics_config_id.ebics_version)
 | 
					            client = EbicsClient(
 | 
				
			||||||
 | 
					                bank, user, version=self.ebics_config_id.ebics_version)
 | 
				
			||||||
 | 
					        except Exception:
 | 
				
			||||||
 | 
					            exctype, value = exc_info()[:2]
 | 
				
			||||||
 | 
					            error = _("EBICS Initialisation Error:")
 | 
				
			||||||
 | 
					            error += '\n' + str(exctype) + '\n' + str(value)
 | 
				
			||||||
 | 
					            raise UserError(error)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        try:
 | 
				
			||||||
 | 
					            public_bank_keys = client.HPB()
 | 
				
			||||||
 | 
					        except EbicsFunctionalError:
 | 
				
			||||||
 | 
					            e = exc_info()
 | 
				
			||||||
 | 
					            error = _("EBICS Functional Error:")
 | 
				
			||||||
 | 
					            error += '\n'
 | 
				
			||||||
 | 
					            error += '%s (code: %s)' % (e[1].message, e[1].code)
 | 
				
			||||||
 | 
					            raise UserError(error)
 | 
				
			||||||
 | 
					        except Exception:
 | 
				
			||||||
 | 
					            exctype, value = exc_info()[:2]
 | 
				
			||||||
 | 
					            error = _("EBICS Initialisation Error:")
 | 
				
			||||||
 | 
					            error += '\n' + str(exctype) + '\n' + str(value)
 | 
				
			||||||
 | 
					            raise UserError(error)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        public_bank_keys = client.HPB()
 | 
					 | 
				
			||||||
        public_bank_keys = public_bank_keys.encode()
 | 
					        public_bank_keys = public_bank_keys.encode()
 | 
				
			||||||
        tmp_dir = os.path.normpath(self.ebics_config_id.ebics_files + '/tmp')
 | 
					        tmp_dir = os.path.normpath(self.ebics_config_id.ebics_files + '/tmp')
 | 
				
			||||||
        if not os.path.isdir(tmp_dir):
 | 
					        if not os.path.isdir(tmp_dir):
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user