Corrected all exceptions to use pep8 naming convention

oscar/apps/basket/models.py

@@ -1,5 +1,3 @@
-from exceptions import Exception
-
 from oscar.apps.basket.abstract_models import (AbstractBasket, AbstractLine, AbstractLineAttribute,
                                                OPEN, MERGED, SAVED, SUBMITTED)
 

oscar/apps/checkout/views.py

@@ -26,8 +26,8 @@ import_module('address.models', ['UserAddress'], locals())
 import_module('address.forms', ['UserAddressForm'], locals())
 import_module('shipping.repository', ['Repository'], locals())
 import_module('customer.models', ['Email'], locals())
-import_module('payment.exceptions', ['RedirectRequiredException', 'UnableToTakePaymentException', 
-                                     'PaymentException'], locals())
+import_module('payment.exceptions', ['RedirectRequired', 'UnableToTakePayment', 
+                                     'PaymentError'], locals())
 import_module('basket.models', ['Basket'], locals())
 
 # Standard logger for checkout events
@@ -346,15 +346,15 @@ class PaymentDetailsView(CheckoutSessionMixin, TemplateView):
             total_incl_tax, total_excl_tax = self.get_order_totals(basket)
             self.handle_payment(order_number, total_incl_tax, **kwargs)
             post_payment.send_robust(sender=self, view=self)
-        except RedirectRequiredException, e:
+        except RedirectRequired, e:
             # Redirect required (eg PayPal, 3DS)
             return HttpResponseRedirect(e.url)
-        except UnableToTakePaymentException, e:
+        except UnableToTakePayment, e:
             # Something went wrong with payment, need to show
             # error to the user.  This type of exception is supposed
             # to set a friendly error message.
             return self.handle_GET(error=e.message)
-        except PaymentException:
+        except PaymentError:
             # Something went wrong which wasn't anticipated.
             return self.handle_GET(error="A problem occured processing payment.")
         else:

oscar/apps/image/dynamic/__init__.py

@@ -1,6 +1,6 @@
 from oscar.apps.image.dynamic.cache import DiskCache
-from oscar.apps.image.dynamic.exceptions import ResizerConfigurationException, \
-    ResizerSyntaxException, ResizerFormatException
+from oscar.apps.image.dynamic.exceptions import ResizerConfigurationError, \
+    ResizerSyntaxError, ResizerFormatError
 from oscar.apps.image.dynamic.mods import AutotrimMod, CropMod, ResizeMod
 from oscar.apps.image.dynamic.response_backends import DirectResponse
 from wsgiref.util import request_uri, application_uri
@@ -25,7 +25,7 @@ def get_class(kls):
             m = getattr(m, comp)
         return m
     except (ImportError, AttributeError), e:
-        raise ResizerConfigurationException('Error importing class "%s"' % kls)
+        raise ResizerConfigurationError('Error importing class "%s"' % kls)
 
 
 def error404(path, start_response):
@@ -119,12 +119,12 @@ class ImageModifier(object):
                     [(x.split("-")[0], x.split("-")[1]) for x in param_parts])
                 self._params['type'] = parts[3]
             except IndexError:
-                raise ResizerSyntaxException("Invalid filename syntax")
+                raise ResizerSyntaxError("Invalid filename syntax")
         else:
-            raise ResizerSyntaxException("Invalid filename syntax")
+            raise ResizerSyntaxError("Invalid filename syntax")
 
         if self._params['type'] not in self.output_formats:
-            raise ResizerFormatException("Invalid output format")
+            raise ResizerFormatError("Invalid output format")
 
     def source_path(self):
         return os.path.join(self._image_root, self.source_filename)
@@ -192,7 +192,7 @@ class BaseImageHandler(object):
         try:
             c = self.cache(path, config)
             m = self.modifier(path, config)
-        except (ResizerSyntaxException, ResizerFormatException), e:
+        except (ResizerSyntaxError, ResizerFormatError), e:
             return error500(path, e, start_response)
         try:
             if not c.check(m.source_path()):

oscar/apps/image/dynamic/exceptions.py

@@ -1,10 +1,10 @@
-class ResizerConfigurationException(Exception):
+class ResizerConfigurationError(Exception):
     pass
 
 
-class ResizerSyntaxException(Exception):
+class ResizerSyntaxError(Exception):
     pass
 
 
-class ResizerFormatException(Exception):
+class ResizerFormatError(Exception):
     pass

oscar/apps/image/dynamic/response_backends.py

@@ -1,4 +1,4 @@
-from oscar.apps.image.dynamic.exceptions import ResizerConfigurationException
+from oscar.apps.image.dynamic.exceptions import ResizerConfigurationError
 
 class BaseResponse(object):
     def __init__(self,config,mime_type,cache,start_response):
@@ -37,10 +37,10 @@ class NginxSendfileResponse(BaseResponse):
     def build_response(self):
         if not hasattr(self.cache, 'file_info'):
             msg = "Cache doesn't implements the method 'file_info'"
-            raise ResizerConfigurationException(msg)
+            raise ResizerConfigurationError(msg)
         if not self.config.get('nginx_sendfile_path',None):
             msg = 'Must provide nginx_sendfile_path in configuration'
-            raise ResizerConfigurationException(msg)
+            raise ResizerConfigurationError(msg)
 
         status = '200 OK'
         

oscar/apps/image/exceptions.py

@@ -1,8 +1,10 @@
-class ImageImportException(Exception):
+class ImageImportError(Exception):
     pass
 
-class IdenticalImageException(Exception):
+
+class IdenticalImageError(Exception):
     pass
 
+
 class InvalidImageArchive(Exception):
     pass    

oscar/apps/image/management/commands/import_images.py

@@ -7,7 +7,6 @@ from django.core.management.base import BaseCommand, CommandError
 
 from oscar.core.loading import import_module
 import_module('image.utils', ['Importer'], locals())
-import_module('image.exceptions', ['ImageImportException'], locals())
 
 
 class Command(BaseCommand):

oscar/apps/image/utils.py

@@ -11,7 +11,7 @@ from django.core.files import File
 from django.core.exceptions import FieldError
 
 from oscar.core.loading import import_module
-import_module('image.exceptions', ['ImageImportException', 'IdenticalImageException', 'InvalidImageArchive'], locals())
+import_module('image.exceptions', ['ImageImportError', 'IdenticalImageError', 'InvalidImageArchive'], locals())
 import_module('product.models', ['Item'], locals())
 import_module('image.models', ['Image'], locals())
 
@@ -43,14 +43,14 @@ class Importer(object):
                 except Item.DoesNotExist:
                     self.logger.warning("No item matching %s='%s'" % (self._field, lookup_value))
                     stats['num_skipped'] += 1
-                except IdenticalImageException:
+                except IdenticalImageError:
                     self.logger.warning(" - Identical image already exists for %s='%s', skipping" % (self._field, lookup_value))
                     stats['num_skipped'] += 1
                 except IOError, e:
-                    raise ImageImportException('%s is not a valid image (%s)' % (filename, e))    
+                    raise ImageImportError('%s is not a valid image (%s)' % (filename, e))    
                     stats['num_invalid'] += 1
                 except FieldError, e:
-                    raise ImageImportException(e)
+                    raise ImageImportError(e)
                     self._process_image(image_dir, filename)
             if image_dir != dirname:
                 shutil.rmtree(image_dir)
@@ -115,7 +115,7 @@ class Importer(object):
             next_index = existing.display_order + 1
             try:
                 if new_data == existing.original.read():
-                    raise IdenticalImageException()
+                    raise IdenticalImageError()
             except IOError:
                 # File probably doesn't exist
                 existing.delete()

oscar/apps/partner/exceptions.py

@@ -1,5 +1,6 @@
-class ImportException(Exception):
+class ImportError(Exception):
     pass
 
-class CatalogueImportException(Exception):
+
+class CatalogueImportError(Exception):
     pass

oscar/apps/partner/management/commands/import_catalogue.py

@@ -6,7 +6,7 @@ from django.core.management.base import BaseCommand, CommandError
 
 from oscar.core.loading import import_module
 import_module('partner.utils', ['CatalogueImporter'], locals())
-import_module('partner.exceptions', ['CatalogueImportException'], locals())
+import_module('partner.exceptions', ['CatalogueImportError'], locals())
 
 
 class Command(BaseCommand):
@@ -37,7 +37,7 @@ class Command(BaseCommand):
             logger.info(" - Importing records from '%s'" % file_path)
             try:
                 importer.handle(file_path)
-            except CatalogueImportException, e:
+            except CatalogueImportError, e:
                 raise CommandError(str(e))
             
     def _get_logger(self):

oscar/apps/partner/management/commands/import_stock.py

@@ -7,7 +7,7 @@ from django.core.management.base import BaseCommand, CommandError
 
 from oscar.core.loading import import_module
 import_module('partner.utils', ['StockImporter'], locals())
-import_module('partner.exceptions', ['ImportException'], locals())
+import_module('partner.exceptions', ['ImportError'], locals())
 
 
 class Command(BaseCommand):
@@ -33,7 +33,7 @@ class Command(BaseCommand):
             logger.info("Starting stock import")
             logger.info(" - Importing records from '%s'" % args[1])
             importer.handle(args[1])
-        except ImportException, e:
+        except ImportError, e:
             raise CommandError(str(e))
             
     def _get_logger(self):

oscar/apps/partner/tests/import_catalogue.py

@@ -4,7 +4,7 @@ from django.test import TestCase
 import logging
 
 from oscar.apps.partner.utils import CatalogueImporter
-from oscar.apps.partner.exceptions import ImportException
+from oscar.apps.partner.exceptions import ImportError
 from oscar.apps.product.models import ItemClass, Item
 from oscar.apps.partner.models import Partner, StockRecord
 from oscar.test.helpers import create_product
@@ -27,17 +27,17 @@ class CommandEdgeCasesTest(TestCase):
 
     def test_sending_no_file_argument_raises_exception(self):
         self.importer.afile = None
-        with self.assertRaises(ImportException):
+        with self.assertRaises(ImportError):
             self.importer.handle()
 
     def test_sending_directory_as_file_raises_exception(self):
         self.importer.afile = "/tmp"
-        with self.assertRaises(ImportException):
+        with self.assertRaises(ImportError):
             self.importer.handle()
 
     def test_importing_nonexistant_file_raises_exception(self):
         self.importer.afile = "/tmp/catalogue-import.zgvsfsdfsd"
-        with self.assertRaises(ImportException):
+        with self.assertRaises(ImportError):
             self.importer.handle()
 
 

oscar/apps/partner/utils.py

@@ -5,7 +5,7 @@ from decimal import Decimal as D
 
 from oscar.core.loading import import_module
 
-import_module('partner.exceptions', ['ImportException'], locals())
+import_module('partner.exceptions', ['ImportError'], locals())
 import_module('partner.models', ['Partner', 'StockRecord'], locals())
 import_module('product.models', ['ItemClass', 'Item'], locals())
 
@@ -20,12 +20,12 @@ class StockImporter(object):
             self._partner = Partner.objects.get(name=partner)
         except Partner.DoesNotExist:
             name_list = ", ".join([d['name'] for d in Partner.objects.values('name')])
-            raise ImportException("Partner named '%s' does not exist (existing partners: %s)" % (partner, name_list))
+            raise ImportError("Partner named '%s' does not exist (existing partners: %s)" % (partner, name_list))
         
     def handle(self, file_path=None):
         u"""Handles the actual import process"""
         if not file_path:
-            raise ImportException("No file path supplied")
+            raise ImportError("No file path supplied")
         Validator().validate(file_path)
         self._import(file_path)
 
@@ -97,7 +97,7 @@ class CatalogueImporter(object):
     def handle(self, file_path=None):
         u"""Handles the actual import process"""
         if not file_path:
-            raise ImportException("No file path supplied")
+            raise ImportError("No file path supplied")
         Validator().validate(file_path)
         if self._flush is True:
             self._flush_product_data()
@@ -177,12 +177,12 @@ class Validator(object):
     def _exists(self, file_path):
         u"""Check whether a file exists"""
         if not os.path.exists(file_path):
-            raise ImportException("%s does not exist" % (file_path))
+            raise ImportError("%s does not exist" % (file_path))
         
     def _is_file(self, file_path):
         u"""Check whether file is actually a file type"""
         if not os.path.isfile(file_path):
-            raise ImportException("%s is not a file" % (file_path))
+            raise ImportError("%s is not a file" % (file_path))
         
     def _is_readable(self, file_path):
         u"""Check file is readable"""
@@ -190,4 +190,4 @@ class Validator(object):
             f = open(file_path, 'r')
             f.close()
         except:
-            raise ImportException("%s is not readable" % (file_path))
+            raise ImportError("%s is not readable" % (file_path))

oscar/apps/payment/datacash/utils.py

@@ -10,8 +10,8 @@ from django.core.mail import mail_admins
 
 from oscar.core.loading import import_module
 import_module('payment.datacash.models', ['OrderTransaction'], locals())
-import_module('payment.exceptions', ['TransactionDeclinedException', 'GatewayException', 
-                                     'InvalidGatewayRequestException'], locals())
+import_module('payment.exceptions', ['TransactionDeclined', 'GatewayError', 
+                                     'InvalidGatewayRequestError'], locals())
 
 # Status codes
 ACCEPTED, DECLINED, INVALID_CREDENTIALS = '1', '7', '10'
@@ -36,7 +36,7 @@ class Gateway(object):
         response = conn.getresponse()
         response_xml = response.read()
         if response.status != httplib.OK:
-            raise GatewayException("Unable to communicate with payment gateway (code: %s, response: %s)" % (response.status, response_xml))
+            raise GatewayError("Unable to communicate with payment gateway (code: %s, response: %s)" % (response.status, response_xml))
         conn.close()
         
         # Save response XML
@@ -231,10 +231,10 @@ class Facade(object):
             import pprint
             msg = "Order #%s:\n%s" % (order_number, pprint.pprint(response))
             mail_admins("Datacash credentials are not valid", msg)
-            raise InvalidGatewayRequestException("Unable to communicate with payment gateway, please try again later")
+            raise InvalidGatewayRequestError("Unable to communicate with payment gateway, please try again later")
         
         if response['status'] == DECLINED:
-            raise TransactionDeclinedException("Your bank declined this transaction, please check your details and try again")
+            raise TransactionDeclined("Your bank declined this transaction, please check your details and try again")
         
         return response['datacash_reference']
         

oscar/apps/payment/exceptions.py

@@ -1,20 +1,20 @@
-class PaymentException(Exception):
+class PaymentError(Exception):
     pass
 
 
-class TransactionDeclinedException(PaymentException):
+class TransactionDeclined(PaymentError):
     pass
 
 
-class GatewayException(PaymentException):
+class GatewayError(PaymentError):
     pass
 
 
-class InvalidGatewayRequestException(PaymentException):
+class InvalidGatewayRequestError(PaymentError):
     pass
 
 
-class RedirectRequiredException(Exception):
+class RedirectRequired(PaymentError):
     """
     Exception to be used when payment processsing requires a redirect
     """
@@ -23,7 +23,7 @@ class RedirectRequiredException(Exception):
         self.url = url
 
 
-class UnableToTakePaymentException(Exception):
+class UnableToTakePayment(PaymentError):
     """
     Exception to be used for ANTICIPATED payment errors (eg card number wrong, expiry date
     has passed).  The message passed here will be shown to the end user.

oscar/core/loading.py

@@ -1,4 +1,3 @@
-from exceptions import Exception
 from imp import new_module
 
 from django.conf import settings