Merge branch 'develop'

Mostrar mensaje no autorizado
This commit is contained in:
Mauricio Baeza 2017-12-12 17:34:36 -06:00
commit 92ff62d9f0
3 changed files with 12 additions and 11 deletions

View File

@ -325,19 +325,8 @@ class Certificado(object):
self._path_key = paths['path_key']
self._path_cer = paths['path_cer']
self._modulus = ''
#~ self._save_files()
self.error = ''
#~ def _save_files(self):
#~ try:
#~ self._path_key = _save_temp(bytes(self._key))
#~ self._path_cer = _save_temp(bytes(self._cer))
#~ except Exception as e:
#~ log.error(e)
#~ self._path_key = ''
#~ self._path_cer = ''
#~ return
def _kill(self, path):
try:
os.remove(path)
@ -1699,6 +1688,7 @@ class ImportFacturaLibre(object):
'0': 0.0,
'-2/3': 0.106667,
'-0.5': 0.005,
'-10.6666': 0.106667,
}
data = []

View File

@ -0,0 +1,8 @@
[uwsgi]
http = 127.0.0.1:8000
wsgi-file = main.py
callable = app
master = true
processes = 4
threads = 4

View File

@ -3479,6 +3479,9 @@ def authenticate(args):
obj = Usuarios.get(usuario=args['usuario'], es_activo=True)
except Usuarios.DoesNotExist:
return respuesta, None
except ProgrammingError as e:
log.error(e)
return respuesta, None
if not obj.contraseña.check_password(args['contra']):
return respuesta, None