diff --git a/distil/collector/base.py b/distil/collector/base.py index d0749cf..0a3cccc 100644 --- a/distil/collector/base.py +++ b/distil/collector/base.py @@ -135,7 +135,7 @@ class BaseCollector(object): root_vol = openstack.get_root_volume(entry['resource_id']) except Exception as e: LOG.warning( - 'Error occured when getting root_volume for %s, reason: %s' % + 'Error occurred when getting root_volume for %s, reason: %s' % (entry['resource_id'], str(e)) ) @@ -160,7 +160,7 @@ class BaseCollector(object): ) except Exception as e: LOG.warning( - 'Error occured when getting image %s, reason: %s' % + 'Error occurred when getting image %s, reason: %s' % (image_id, str(e)) ) diff --git a/distil/erp/drivers/odoo.py b/distil/erp/drivers/odoo.py index baf52e0..78abe7e 100644 --- a/distil/erp/drivers/odoo.py +++ b/distil/erp/drivers/odoo.py @@ -310,7 +310,7 @@ class OdooDriver(driver.BaseDriver): result[v['date_invoice']].update({'details': details}) except Exception as e: LOG.exception( - 'Error occured when getting invoices from Odoo, ' + 'Error occurred when getting invoices from Odoo, ' 'error: %s' % str(e) ) diff --git a/distil/interface.py b/distil/interface.py index bf77230..ea85c64 100644 --- a/distil/interface.py +++ b/distil/interface.py @@ -111,7 +111,7 @@ def sort_entries(data): class Tenant(object): - """A wrapper object for the tenant recieved from keystone.""" + """A wrapper object for the tenant received from keystone.""" def __init__(self, tenant, conn): self.tenant = tenant self.conn = conn # the Interface object that produced us.