Skip to content

Commit

Permalink
feat: Port to python3
Browse files Browse the repository at this point in the history
  • Loading branch information
murilobsd committed Dec 22, 2022
1 parent 885abb3 commit 40aa545
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 43 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Contribuidores.
---
- KMEE
- [Luiz Felipe do Divino](https://github.com/lfdivino)
- [Kovi Engineering](https://github.com/kovihq)

Suporte especializado.
---
Expand All @@ -35,3 +36,7 @@ Gostaria de contribuir?
Implementação & Customizações Odoo?
---
Conte com a gente. Saiba mais em nosso site: [kmee.com.br](https://www.kmee.com.br/consultoria_odoo/)

## Changelog

- Port to python3.10.8
6 changes: 3 additions & 3 deletions pyserasa/bloco.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# -*- coding: utf-8 -*-
from erros import CampoInexistenteError
from pyserasa.erros import CampoInexistenteError


class Bloco(object):

def __getitem__(self, key):
campo = ([c for c in self.campos if c.indice == key or c.nome == key] or [None])[0]
if not campo:
print CampoInexistenteError(key)
print(CampoInexistenteError(key))
return campo.get(self)

def __getattr__(self, name):
campo = ([c for c in self.campos.campos if c._nome == name] or [None])[0]
if not campo:
print CampoInexistenteError().exibirErro(name)
print(CampoInexistenteError().exibirErro(name))
else:
return campo._valor
4 changes: 2 additions & 2 deletions pyserasa/blocosDados.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
from registrosDados import *
from bloco import Bloco
from pyserasa.registrosDados import *
from pyserasa.bloco import Bloco


class pendenciasInternas(Bloco):
Expand Down
56 changes: 28 additions & 28 deletions pyserasa/crednet.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
from erros import BlocoInexistenteError
from blocosDados import pendenciasInternas
from blocosDados import pendenciasFinanceiras
from blocosDados import protestosEstados
from blocosDados import chequesSemFundos
from blocosDados import covemDevedores
from blocosDados import grafias
from pyserasa.erros import BlocoInexistenteError
from pyserasa.blocosDados import pendenciasInternas
from pyserasa.blocosDados import pendenciasFinanceiras
from pyserasa.blocosDados import protestosEstados
from pyserasa.blocosDados import chequesSemFundos
from pyserasa.blocosDados import covemDevedores
from pyserasa.blocosDados import grafias


class Crednet(object):
Expand All @@ -21,44 +21,44 @@ def __init__(self):
def __getattr__(self, name):
bloco = ([c for c in self.blocos if c.nome == name] or [None])[0]
if not bloco:
print BlocoInexistenteError().exibirErro(name)
print(BlocoInexistenteError().exibirErro(name))
else:
if bloco.nome == 'pendenciasInternas':
print bloco.nome_bloco + "\n"
print(bloco.nome_bloco + "\n")
for registro in bloco.blocos:
for campos in registro.campos.campos:
print campos._nome,
print ": ",
print campos._valor
print(campos._nome,)
print(": ",)
print(campos._valor)

print " "
print(" ")
if bloco.nome == 'pendenciasFinanceiras':
print bloco.nome_bloco + "\n"
print(bloco.nome_bloco + "\n")
for registro in bloco.blocos:
for campos in registro.campos.campos:
print campos._nome,
print ": ",
print campos._valor
print(campos._nome,)
print(": ",)
print(campos._valor)

print " "
print(" ")
if bloco.nome == 'protestosEstados':
print bloco.nome_bloco + "\n"
print(bloco.nome_bloco + "\n")
for registro in bloco.blocos:
for campos in registro.campos.campos:
print campos._nome,
print ": ",
print campos._valor
print(campos._nome,)
print(": ",)
print(campos._valor)

print " "
print(" ")
if bloco.nome == 'chequesSemFundos':
print bloco.nome_bloco + "\n"
print(bloco.nome_bloco + "\n")
for registro in bloco.blocos:
for campos in registro.campos.campos:
print campos._nome,
print ": ",
print campos._valor
print(campos._nome,)
print(": ",)
print(campos._valor)

print " "
print(" ")
else:
return bloco

Expand Down
8 changes: 5 additions & 3 deletions pyserasa/parserStringDados.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ def montar_bloco(self, bloco, arquivo):
and bloco[0:4] != u'I105':
nome_classe = nome_classe + "_subtipo" + bloco[4:6]

mod_serializer = __import__('blocosDados', globals(), locals())
importlib = __import__('importlib')
mod_serializer = importlib.import_module('pyserasa.blocosDados')

try:
func = getattr(mod_serializer, nome_classe)
Expand All @@ -68,8 +69,9 @@ def montar_bloco(self, bloco, arquivo):
arquivo.blocos[5].blocos.append(bloco_montado)
else:
arquivo.blocos.append(bloco_montado)
except:
print 'Invalid block', nome_classe
except Exception as e:
print("Error: ", e)
print('Invalid block', nome_classe)
finally:
return arquivo

Expand Down
8 changes: 4 additions & 4 deletions pyserasa/registrosDados.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-

from campos import Campo
from tiposCampos import campoData
from tiposCampos import campoDinheiro
from pyserasa.campos import Campo
from pyserasa.tiposCampos import campoData
from pyserasa.tiposCampos import campoDinheiro


class RegistrosB49C(object):
Expand Down Expand Up @@ -1749,4 +1749,4 @@ def __init__(self, bloco):
self.campos.append(Campo(1, 0, 'tipoReg', bloco, 4))
self.campos.append(Campo(2, 4, 'codigo', bloco, 3))
self.campos.append(Campo(3, 7, 'mensagem', bloco, 70))
self.campos.append(Campo(4, 7, 'filler', bloco, 38))
self.campos.append(Campo(4, 7, 'filler', bloco, 38))
4 changes: 2 additions & 2 deletions pyserasa/tiposCampos.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
from campos import Campo
from pyserasa.campos import Campo
import locale

class campoData(Campo):
Expand Down Expand Up @@ -32,4 +32,4 @@ def mascaraDinheiro(self, valor):
valor = valor[0:len(valor)-2] + "." + valor[len(valor)-2:len(valor)]
valor = float(valor)

return valor
return valor
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='pySerasa',
version='0.1',
version='1.1',
packages=['pyserasa'],
url='https://gitlab.kmee.com.br/python/pySerasa',
author='KMEE',
Expand Down

0 comments on commit 40aa545

Please sign in to comment.