Merge pull request #43 from RoelAdriaans-B-informed/8.0

[IMP] Soft fail on missing cups import
This commit is contained in:
Pedro M. Baeza
2015-12-10 12:49:21 +01:00
2 changed files with 16 additions and 5 deletions

View File

@@ -22,14 +22,20 @@
#
##############################################################################
import logging
_logger = logging.getLogger(__name__)
import os
from tempfile import mkstemp
import cups
try:
import cups
except ImportError:
_logger.debug('Cannot `import cups`.')
from openerp import models, fields, api, _
from openerp.exceptions import Warning
from openerp.tools.config import config
_logger = logging.getLogger(__name__)
CUPS_HOST = config.get('cups_host', 'localhost')
CUPS_PORT = int(config.get('cups_port', 631)) # config.get returns a string

View File

@@ -21,13 +21,18 @@
#
##############################################################################
import cups
import logging
_logger = logging.getLogger(__name__)
try:
import cups
except ImportError:
_logger.debug('Cannot `import cups`.')
from openerp.exceptions import Warning
from openerp import models, api, _
from openerp.tools.config import config
import logging
_logger = logging.getLogger(__name__)
CUPS_HOST = config.get('cups_host', 'localhost')
CUPS_PORT = int(config.get('cups_port', 631))