[FIX] Update Travis and fix PEP8

This commit is contained in:
Pedro M. Baeza 2015-02-19 00:06:17 +01:00
parent ac32e340c3
commit e7e0ff440c
2 changed files with 5 additions and 4 deletions

View File

@ -4,8 +4,9 @@ python:
- "2.7"
env:
- VERSION="7.0" ODOO_REPO="odoo/odoo"
- VERSION="7.0" ODOO_REPO="OCA/OCB"
- VERSION="7.0" LINT_CHECK=1
- VERSION="7.0" ODOO_REPO="odoo/odoo" LINT_CHECK=0
- VERSION="7.0" ODOO_REPO="OCA/OCB" LINT_CHECK=0
virtualenv:
system_site_packages: true

View File

@ -49,8 +49,8 @@ class IrAttachment(Model):
try:
import magic
ms = magic.open(
hasattr(magic, 'MAGIC_MIME_TYPE')
and magic.MAGIC_MIME_TYPE or magic.MAGIC_MIME)
hasattr(magic, 'MAGIC_MIME_TYPE') and
magic.MAGIC_MIME_TYPE or magic.MAGIC_MIME)
ms.load()
mimetype = ms.buffer(
base64.b64decode(this[binary_field]))