Skip to content

Commit 0549295

Browse files
authored
Merge pull request #56 from vicenteneto/dev
Corrigindo erro de ascii e atualizando o serviço de parciais
2 parents 4ba66c8 + 5cddbb0 commit 0549295

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

cartolafc/api.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,10 +308,14 @@ def _calculate_parcial(self, time, parciais):
308308
raise CartolaFCError('Time ou parciais não são válidos.')
309309

310310
time.pontos = 0
311+
time.jogados = 0
311312
for atleta in time.atletas:
312313
atleta_parcial = parciais.get(atleta.id)
313-
atleta.pontos = atleta_parcial.pontos if isinstance(atleta_parcial, Atleta) else 0
314-
atleta.scout = atleta_parcial.scout if isinstance(atleta_parcial, Atleta) else {}
314+
tem_parcial = isinstance(atleta_parcial, Atleta)
315+
316+
atleta.pontos = atleta_parcial.pontos if tem_parcial else 0
317+
atleta.scout = atleta_parcial.scout if tem_parcial else {}
318+
time.jogados += 1 if tem_parcial else 0
315319

316320
if atleta.is_capitao:
317321
atleta.pontos *= 2

setup.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,21 @@
1616
"""
1717
from setuptools import setup
1818

19-
version = '1.4.20'
19+
version = '1.4.21'
2020
packages = ['cartolafc']
2121
install_requires = ['redis', 'requests']
2222
python_cartolafc_pkg_data = []
2323

24+
try:
25+
long_description = unicode(open('README.md').read(), errors='ignore')
26+
except Exception:
27+
long_description = open('README.md', errors='ignore').read()
28+
2429
setup(
2530
name='Python-CartolaFC',
2631
version=version,
2732
description='Uma interface em Python para a API Rest do Cartola FC',
28-
long_description=open('README.md').read(),
33+
long_description=long_description,
2934
long_description_content_type='text/markdown',
3035
url='https://github.com/vicenteneto/python-cartolafc',
3136
author='Vicente Neto',

0 commit comments

Comments
 (0)