Skip to content

Commit

Permalink
[FIX] Pylint fix for String parameter of raise "Exceptions" requires …
Browse files Browse the repository at this point in the history 
…translation.
  • Loading branch information
@atchuthan
atchuthan committed Jun 14, 2016
1 parent 2b8636b commit 6d935e6
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 58 deletions.
6 changes: 3 additions & 3 deletions magentoerpconnect/partner.py
View file
Expand Up @@ -6,7 +6,7 @@
import logging
import xmlrpclib
from collections import namedtuple
from openerp import models, fields, api
from openerp import models, fields, api, _
from openerp.addons.connector.queue.job import job
from openerp.addons.connector.connector import ConnectorUnit
from openerp.addons.connector.exception import MappingError
Expand Down Expand Up @@ -253,8 +253,8 @@ def customer_group_id(self, record):
category_id = binder.to_openerp(record['group_id'], unwrap=True)

if category_id is None:
raise MappingError("The partner category with "
"magento id %s does not exist" %
raise MappingError(_("The partner category with "
"magento id %s does not exist") %
record['group_id'])

# FIXME: should remove the previous tag (all the other tags from
Expand Down
8 changes: 4 additions & 4 deletions magentoerpconnect/product.py
View file
Expand Up @@ -456,8 +456,8 @@ def categories(self, record):
for mag_category_id in mag_categories:
cat_id = binder.to_openerp(mag_category_id, unwrap=True)
if cat_id is None:
raise MappingError("The product category with "
"magento id %s is not imported." %
raise MappingError(_("The product category with "
"magento id %s is not imported.") %
mag_category_id)

category_ids.append(cat_id)
Expand Down Expand Up @@ -523,8 +523,8 @@ def _validate_product_type(self, data):
types = product_model.product_type_get()
available_types = [typ[0] for typ in types]
if product_type not in available_types:
raise InvalidDataError("The product type '%s' is not "
"yet supported in the connector." %
raise InvalidDataError(_("The product type '%s' is not "
"yet supported in the connector.") %
product_type)

def _must_skip(self):
Expand Down
6 changes: 3 additions & 3 deletions magentoerpconnect/product_category.py
View file
Expand Up @@ -5,7 +5,7 @@

import logging
import xmlrpclib
from openerp import models, fields
from openerp import models, fields, _
from openerp.addons.connector.unit.mapper import (mapping,
ImportMapper
)
Expand Down Expand Up @@ -250,7 +250,7 @@ def parent_id(self, record):
mag_cat_id = binder.to_openerp(record['parent_id'])

if category_id is None:
raise MappingError("The product category with "
"magento id %s is not imported." %
raise MappingError(_("The product category with "
"magento id %s is not imported.") %
record['parent_id'])
return {'parent_id': category_id, 'magento_parent_id': mag_cat_id}
2 changes: 1 addition & 1 deletion magentoerpconnect/related_action.py
View file
Expand Up @@ -35,7 +35,7 @@ def link(session, job, backend_id_pos=2, magento_id_pos=3):
try:
url = adapter.admin_url(magento_id)
except ValueError:
raise exceptions.Warning(
raise exceptions.UserError(
_('No admin URL configured on the backend or '
'no admin path is defined for this record.')
)
Expand Down
26 changes: 13 additions & 13 deletions magentoerpconnect/sale.py
View file
Expand Up @@ -349,21 +349,21 @@ def _rule_always(self, record, method):

def _rule_never(self, record, method):
""" Never import the order """
raise NothingToDoJob('Orders with payment method %s '
'are never imported.' %
raise NothingToDoJob(_('Orders with payment method %s '
'are never imported.') %
record['payment']['method'])

def _rule_authorized(self, record, method):
""" Import the order only if payment has been authorized. """
if not record.get('payment', {}).get('base_amount_authorized'):
raise OrderImportRuleRetry('The order has not been authorized.\n'
'The import will be retried later.')
raise OrderImportRuleRetry(_('The order has not been authorized.\n'
'The import will be retried later.'))

def _rule_paid(self, record, method):
""" Import the order only if it has received a payment """
if not record.get('payment', {}).get('amount_paid'):
raise OrderImportRuleRetry('The order has not been paid.\n'
'The import will be retried later.')
raise OrderImportRuleRetry(_('The order has not been paid.\n'
'The import will be retried later.'))

_rules = {'always': _rule_always,
'paid': _rule_paid,
Expand All @@ -376,15 +376,15 @@ def _rule_global(self, record, method):
# the order has been canceled since the job has been created
order_id = record['increment_id']
if record['state'] == 'canceled':
raise NothingToDoJob('Order %s canceled' % order_id)
raise NothingToDoJob(_('Order %s canceled') % order_id)
max_days = method.days_before_cancel
if max_days:
fmt = '%Y-%m-%d %H:%M:%S'
order_date = datetime.strptime(record['created_at'], fmt)
if order_date + timedelta(days=max_days) < datetime.now():
raise NothingToDoJob('Import of the order %s canceled '
'because it has not been paid since %d '
'days' % (order_id, max_days))
raise NothingToDoJob(_('Import of the order %s canceled '
'because it has not been paid since %d) '
'days') % (order_id, max_days))

def check(self, record):
""" Check whether the current sale order should be imported
Expand All @@ -400,15 +400,15 @@ def check(self, record):
limit=1,
)
if not method:
raise FailedJobError(
raise FailedJobError(_(
"The configuration is missing for the Payment Mode '%s'.\n\n"
"Resolution:\n"
"- Go to "
"'Accounting > Configuration > Management > Payment Modes'\n"
"- Create a new Payment Mode with name '%s'\n"
"- Eventually link the Payment Mode to an existing Workflow "
"Process or create a new one." % (payment_method,
payment_method))
"Process or create a new one.") % (payment_method,
payment_method))
self._rule_global(record, method)
self._rules[method.import_rule](self, record, method)

Expand Down
13 changes: 6 additions & 7 deletions magentoerpconnect/stock_picking.py
View file
Expand Up @@ -5,8 +5,7 @@

import logging
import xmlrpclib
from openerp import models, fields
from openerp.tools.translate import _
from openerp import models, fields, _
from openerp.addons.connector.queue.job import job, related_action
from openerp.addons.connector.event import on_record_create
from openerp.addons.connector.exception import NothingToDoJob
Expand Down Expand Up @@ -166,18 +165,18 @@ def run(self, binding_id):
'sale order.'))
args = self._get_args(picking, lines_info)
else:
raise ValueError("Wrong value for picking_method, authorized "
"values are 'partial' or 'complete', "
"found: %s" % picking_method)
raise ValueError(_("Wrong value for picking_method, authorized "
"values are 'partial' or 'complete', "
"found: %s") % picking_method)
try:
magento_id = self.backend_adapter.create(*args)
except xmlrpclib.Fault as err:
# When the shipping is already created on Magento, it returns:
# <Fault 102: u"Impossible de faire
# l\'exp\xe9dition de la commande.">
if err.faultCode == 102:
raise NothingToDoJob('Canceled: the delivery order already '
'exists on Magento (fault 102).')
raise NothingToDoJob(_('Canceled: the delivery order already '
'exists on Magento (fault 102).'))
else:
raise
else:
Expand Down
28 changes: 14 additions & 14 deletions magentoerpconnect/stock_tracking.py
View file
Expand Up @@ -28,26 +28,26 @@ def _get_tracking_args(self, picking):

def _validate(self, picking):
if picking.state != 'done': # should not happen
raise ValueError("Wrong value for picking state, "
"it must be 'done', found: %s" % picking.state)
raise ValueError(_("Wrong value for picking state, "
"it must be 'done', found: %s") % picking.state)
if not picking.carrier_id.magento_carrier_code:
raise FailedJobError("Wrong value for the Magento carrier code "
"defined in the picking.")
raise FailedJobError(_("Wrong value for the Magento carrier code "
"defined in the picking."))

def _check_allowed_carrier(self, picking, magento_id):
allowed_carriers = self.backend_adapter.get_carriers(magento_id)
carrier = picking.carrier_id
if carrier.magento_carrier_code not in allowed_carriers:
raise FailedJobError("The carrier %(name)s does not accept "
"tracking numbers on Magento.\n\n"
"Tracking codes accepted by Magento:\n"
"%(allowed)s.\n\n"
"Actual tracking code:\n%(code)s\n\n"
"Resolution:\n"
"* Add support of %(code)s in Magento\n"
"* Or deactivate the export of tracking "
"numbers in the setup of the carrier "
"%(name)s." %
raise FailedJobError(_("The carrier %(name)s does not accept "
"tracking numbers on Magento.\n\n"
"Tracking codes accepted by Magento:\n"
"%(allowed)s.\n\n"
"Actual tracking code:\n%(code)s\n\n"
"Resolution:\n"
"* Add support of %(code)s in Magento\n"
"* Or deactivate the export of tracking "
"numbers in the setup of the carrier "
"%(name)s.") %
{'name': carrier.name,
'allowed': allowed_carriers,
'code': carrier.magento_carrier_code})
Expand Down
13 changes: 7 additions & 6 deletions magentoerpconnect/unit/backend_adapter.py
View file
Expand Up @@ -8,6 +8,7 @@
import xmlrpclib

import magento as magentolib
from openerp import _
from openerp.addons.connector.unit.backend_adapter import CRUDAdapter
from openerp.addons.connector.exception import (NetworkRetryableError,
RetryableJobError)
Expand Down Expand Up @@ -161,19 +162,19 @@ def _call(self, method, arguments):
# record(method, arguments, result)
return result
except (socket.gaierror, socket.error, socket.timeout) as err:
raise NetworkRetryableError(
raise NetworkRetryableError(_(
'A network error caused the failure of the job: '
'%s' % err)
'%s') % err)
except xmlrpclib.ProtocolError as err:
if err.errcode in [502, # Bad gateway
503, # Service unavailable
504]: # Gateway timeout
raise RetryableJobError(
raise RetryableJobError(_(
'A protocol error caused the failure of the job:\n'
'URL: %s\n'
'HTTP/HTTPS headers: %s\n'
'Error code: %d\n'
'Error message: %s\n' %
'Error message: %s\n') %
(err.url, err.headers, err.errcode, err.errmsg))
else:
raise
Expand Down Expand Up @@ -234,11 +235,11 @@ def delete(self, id):
def admin_url(self, id):
""" Return the URL in the Magento admin for a record """
if self._admin_path is None:
raise ValueError('No admin path is defined for this record')
raise ValueError(_('No admin path is defined for this record'))
backend = self.backend_record
url = backend.admin_location
if not url:
raise ValueError('No admin URL configured on the backend.')
raise ValueError(_('No admin URL configured on the backend.'))
path = self._admin_path.format(model=self._magento_model,
id=id)
url = url.rstrip('/')
Expand Down
5 changes: 3 additions & 2 deletions magentoerpconnect/unit/binder.py
View file
Expand Up @@ -4,6 +4,7 @@
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

import openerp
from openerp import _
from openerp.addons.connector.connector import Binder
from ..backend import magento

Expand Down Expand Up @@ -147,6 +148,6 @@ def unwrap_model(self):
try:
column = self.model._fields['openerp_id']
except KeyError:
raise ValueError('Cannot unwrap model %s, because it has '
'no openerp_id field' % self.model._name)
raise ValueError(_('Cannot unwrap model %s, because it has '
'no openerp_id field') % self.model._name)
return column.comodel_name
10 changes: 5 additions & 5 deletions magentoerpconnect/unit/export_synchronizer.py
View file
Expand Up @@ -11,7 +11,7 @@
import psycopg2

import openerp
from openerp.tools.translate import _
from openerp import _
from openerp.addons.connector.queue.job import job, related_action
from openerp.addons.connector.unit.synchronizer import Exporter
from openerp.addons.connector.exception import (IDMissingInBackend,
Expand Down Expand Up @@ -162,9 +162,9 @@ def _lock(self):
_logger.info('A concurrent job is already exporting the same '
'record (%s with id %s). Job delayed later.',
self.model._name, self.binding_id)
raise RetryableJobError(
raise RetryableJobError(_(
'A concurrent job is already exporting the same record '
'(%s with id %s). The job will be retried later.' %
'(%s with id %s). The job will be retried later.') %
(self.model._name, self.binding_id))

def _has_to_skip(self):
Expand Down Expand Up @@ -195,11 +195,11 @@ def _retry_unique_violation(self):
yield
except psycopg2.IntegrityError as err:
if err.pgcode == psycopg2.errorcodes.UNIQUE_VIOLATION:
raise RetryableJobError(
raise RetryableJobError(_(
'A database error caused the failure of the job:\n'
'%s\n\n'
'Likely due to 2 concurrent jobs wanting to create '
'the same record. The job will be retried later.' % err)
'the same record. The job will be retried later.') % err)
else:
raise

Expand Down

0 comments on commit 6d935e6

Please sign in to comment.