Skip to content

Commit

Permalink
Refactory code to pass on CI
Browse files Browse the repository at this point in the history 
Signed-off-by: Matheus Horstmann <mch15@inf.ufpr.br>
  • Loading branch information
@horstmannmat
horstmannmat committed Mar 26, 2019
1 parent 212e2d8 commit 4a072cd
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 16 deletions.
2 changes: 1 addition & 1 deletion CepTracker.py
View file
Expand Up @@ -74,7 +74,7 @@ def track(self, cep):
for label, value in zip(header, item):

label = label.lower().strip()
value = re.sub('\s+', ' ', value.strip())
value = re.sub(r'\s+', ' ', value.strip())

if 'localidade' in label:
cidade, estado = value.split('/', 1)
Expand Down
11 changes: 7 additions & 4 deletions PostmonServer.py
View file
Expand Up @@ -31,8 +31,11 @@

def add_cors_headers():
response.headers['Access-Control-Allow-Origin'] = '*'
response.headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, OPTIONS'
response.headers['Access-Control-Allow-Headers'] = ', '.join(request.headers.keys())
response.headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, \
OPTIONS'
response.headers['Access-Control-Allow-Headers'] = ', '.join(
request.
headers.keys())


def validate_format(callback):
Expand Down Expand Up @@ -120,8 +123,8 @@ def _get_cidade_info(db, sigla_uf, nome_cidade):
return db.get_one_cidade(sigla_uf, nome_cidade, fields=fields)


@app.route('/cep/<cep:re:\d{5}-?\d{3}>')
@app_v1.route('/cep/<cep:re:\d{5}-?\d{3}>')
@app.route('/cep/<cep:re:'r'\d{5}-?'r'\d{3}>')
@app_v1.route('/cep/<cep:re:'r'\d{5}-?'r'\d{3}>')
def verifica_cep(cep):
cep = cep.replace('-', '')
db = Database()
Expand Down
4 changes: 2 additions & 2 deletions test/assets/75064590.html
View file
Expand Up @@ -74,7 +74,7 @@
Rua A

</span><br/>
<span class="resposta">Bairro: </span><span class="respostadestaque">Vila Jaiara</span><br/>
<span class="resposta">Bairro: </span><span class="respostadestaque">Vila Jayara</span><br/>
<span class="resposta">Localidade / UF: </span>
<span class="respostadestaque">
Anápolis
Expand Down Expand Up @@ -123,7 +123,7 @@
Rua A

</span><br/>
<span class="resposta">Bairro: </span><span class="respostadestaque">Vila Jaiara Setor Leste</span><br/>
<span class="resposta">Bairro: </span><span class="respostadestaque">Vila Jayara</span><br/>
<span class="resposta">Localidade / UF: </span>
<span class="respostadestaque">
Anápolis
Expand Down
4 changes: 1 addition & 3 deletions test/assets/85100000.html
View file
Expand Up @@ -68,9 +68,7 @@


<span class="resposta">Localidade / UF: </span>
<span class="respostadestaque">Jordão

(Guarapuava)
<span class="respostadestaque">Guarapuava

/PR

Expand Down
2 changes: 1 addition & 1 deletion test/assets/buscacep/75064590.html
View file
Expand Up @@ -296,7 +296,7 @@ <h3>Busca CEP<br>
<a href="http://www.correios.com.br/para-voce/consultas-e-solicitacoes/busca-cep/cep-de-outros-paises">CEP de outros Pa&iacute;ses</a>
</li>
</ul> </span><!-- Fim Menu vertical --></div><!-- column1 --><div class="column2"><div class="breadcrumb"></div><div class="content "><a name="ancora"></a><div class="tituloimagem"><h3>Busca CEP - Endere&ccedil;o</h3></div><div class="ctrlcontent"><script language="JavaScript" type="text/javascript">function detalhaCep(CEP){ document.Geral.CEP.value = CEP;document.Geral.action='sistemas/buscacep/detalhaCEP.cfm';document.Geral.submit();}</script><p>ATEN&Ccedil;&Atilde;O! O CEP 75064-590 FOI DESMEMBRADO CONFORME ABAIXO.</p> <div style="float:left">[ Anterior ] </div><div style="float:left"> [ Pr&oacute;xima ]</div><div style="float:left"><a href="sistemas/buscacep/BuscaCepEndereco.cfm">[ Nova Consulta ]</a> </div> &nbsp;&nbsp;1 a 2 de 2<br><br> <form name="Geral" id="Geral" action="&#x2f;sistemas&#x2f;buscacep&#x2f;resultadoBuscaCepEndereco.cfm" method="post" onsubmit="return _CF_checkGeral(this)"><input type="hidden" name="CEP" value=""></form>
<table class="tmptabela"><tr ><th width="150">Logradouro/Nome:</th><th width="90">Bairro/Distrito:</th><th width="80">Localidade/UF:</th><th width="50">CEP:</th></tr><tr><td width="150">Rua A&nbsp;</td><td width="90">Vila Jaiara&nbsp;</td><td width="80">An&aacute;polis/GO</td><td width="55">75064-590</td></tr><tr bgcolor="#C4DEE9"><td width="150">Rua A&nbsp;</td><td width="90">Vila Jaiara Setor Leste&nbsp;</td><td width="80">An&aacute;polis/GO</td><td width="55">75064-379</td></tr> </table><div style="float:left"> [ Anterior ] </div><div style="float:left"> [ Pr&oacute;xima ]</div><div style="float:left"><a href="sistemas/buscacep/BuscaCepEndereco.cfm">[ Nova Consulta ]</a></div> </div></div></div><br class="clr" /></div></div></div></div><!-- class="wrap" --><!-- laminas --><div class="footer">
<table class="tmptabela"><tr ><th width="150">Logradouro/Nome:</th><th width="90">Bairro/Distrito:</th><th width="80">Localidade/UF:</th><th width="50">CEP:</th></tr><tr><td width="150">Rua A&nbsp;</td><td width="90">Vila Jayara&nbsp;</td><td width="80">An&aacute;polis/GO</td><td width="55">75064-590</td></tr><tr bgcolor="#C4DEE9"><td width="150">Rua A&nbsp;</td><td width="90">Vila Jayara&nbsp;</td><td width="80">An&aacute;polis/GO</td><td width="55">75064-379</td></tr> </table><div style="float:left"> [ Anterior ] </div><div style="float:left"> [ Pr&oacute;xima ]</div><div style="float:left"><a href="sistemas/buscacep/BuscaCepEndereco.cfm">[ Nova Consulta ]</a></div> </div></div></div><br class="clr" /></div></div></div></div><!-- class="wrap" --><!-- laminas --><div class="footer">
<div class="wrap">
<div class="column-footer">
<h3><a href="sistemas/falecomoscorreios">Fale com os Correios</a></h3>
Expand Down
2 changes: 1 addition & 1 deletion test/assets/buscacep/85100000.html
View file
Expand Up @@ -296,7 +296,7 @@ <h3>Busca CEP<br>
<a href="http://www.correios.com.br/para-voce/consultas-e-solicitacoes/busca-cep/cep-de-outros-paises">CEP de outros Pa&iacute;ses</a>
</li>
</ul> </span><!-- Fim Menu vertical --></div><!-- column1 --><div class="column2"><div class="breadcrumb"></div><div class="content "><a name="ancora"></a><div class="tituloimagem"><h3>Busca CEP - Endere&ccedil;o</h3></div><div class="ctrlcontent"><script language="JavaScript" type="text/javascript">function detalhaCep(CEP){ document.Geral.CEP.value = CEP;document.Geral.action='sistemas/buscacep/detalhaCEP.cfm';document.Geral.submit();}</script><p>DADOS ENCONTRADOS COM SUCESSO.</p> <div style="float:left">[ Anterior ] </div><div style="float:left"> [ Pr&oacute;xima ]</div><div style="float:left"><a href="sistemas/buscacep/BuscaCepEndereco.cfm">[ Nova Consulta ]</a> </div> &nbsp;&nbsp;1 a 1 de 1<br><br> <form name="Geral" id="Geral" action="&#x2f;sistemas&#x2f;buscacep&#x2f;resultadoBuscaCepEndereco.cfm" method="post" onsubmit="return _CF_checkGeral(this)"><input type="hidden" name="CEP" value=""></form>
<table class="tmptabela"><tr ><th width="150">Logradouro/Nome:</th><th width="90">Bairro/Distrito:</th><th width="80">Localidade/UF:</th><th width="50">CEP:</th></tr><tr><td width="150">&nbsp;</td><td width="90">&nbsp;</td><td width="80">Jord&atilde;o (Guarapuava)/PR - Povoado</td><td width="55">85100-000</td></tr> </table><div style="float:left"> [ Anterior ] </div><div style="float:left"> [ Pr&oacute;xima ]</div><div style="float:left"><a href="sistemas/buscacep/BuscaCepEndereco.cfm">[ Nova Consulta ]</a></div> </div></div></div><br class="clr" /></div></div></div></div><!-- class="wrap" --><!-- laminas --><div class="footer">
<table class="tmptabela"><tr ><th width="150">Logradouro/Nome:</th><th width="90">Bairro/Distrito:</th><th width="80">Localidade/UF:</th><th width="50">CEP:</th></tr><tr><td width="150">&nbsp;</td><td width="90">&nbsp;</td><td width="80">Guarapuava/PR - Povoado</td><td width="55">85100-000</td></tr> </table><div style="float:left"> [ Anterior ] </div><div style="float:left"> [ Pr&oacute;xima ]</div><div style="float:left"><a href="sistemas/buscacep/BuscaCepEndereco.cfm">[ Nova Consulta ]</a></div> </div></div></div><br class="clr" /></div></div></div></div><!-- class="wrap" --><!-- laminas --><div class="footer">
<div class="wrap">
<div class="column-footer">
<h3><a href="sistemas/falecomoscorreios">Fale com os Correios</a></h3>
Expand Down
8 changes: 4 additions & 4 deletions test/postmon_test.py
View file
Expand Up @@ -30,17 +30,17 @@ class PostmonBaseTest(object):
'estado': 'SP'
}],
'85100000': [{
'cidade': u'Jordão (Guarapuava)',
'cidade': u'Guarapuava',
'estado': 'PR'
}],
'75064590': [{
'logradouro': 'Rua A',
'bairro': 'Vila Jaiara',
'bairro': 'Vila Jayara',
'cidade': u'Anápolis',
'estado': 'GO'
}, {
'logradouro': 'Rua A',
'bairro': 'Vila Jaiara Setor Leste',
'bairro': 'Vila Jayara',
'cidade': u'Anápolis',
'estado': 'GO'
}],
Expand Down Expand Up @@ -167,7 +167,7 @@ def get_cep(self, cep):
self.jsonp_query_key,
self.jsonp_func_name))

regexp = re.compile('^%s\((.*)\);$' % self.jsonp_func_name)
regexp = re.compile(r'^%s\((.*)\);$' % self.jsonp_func_name)
json_data = re.findall(regexp, response.body)[0]

return json.loads(json_data)
Expand Down

0 comments on commit 4a072cd

Please sign in to comment.