Commit 4e25bc71 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #15609 -- Fixed some 'raise' statements to use the newer style syntax. Thanks, DaNmarner 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f43b3f58

django/contrib/gis/gdal/error.py

+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,6 @@ def check_err(code): 
        return

    elif code in OGRERR_DICT:

        e, msg = OGRERR_DICT[code]

        raise e, msg

        raise e(msg)

    else:

        raise OGRException('Unknown error code: "%s"' % code)

django/test/_doctest.py

+2 −2
Original line number Diff line number Diff line
@@ -380,9 +380,9 @@ class _OutputRedirectingPdb(pdb.Pdb): 
# [XX] Normalize with respect to os.path.pardir?

def _module_relative_path(module, path):

    if not inspect.ismodule(module):

        raise TypeError, 'Expected a module: %r' % module

        raise TypeError('Expected a module: %r' % module)

    if path.startswith('/'):

        raise ValueError, 'Module-relative files may not have absolute paths'

        raise ValueError('Module-relative files may not have absolute paths')



    # Find the base directory for the path.

    if hasattr(module, '__file__'):

django/utils/unittest/case.py

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ class TestCase(unittest.TestCase): 
            excName = excClass.__name__

        else:

            excName = str(excClass)

        raise self.failureException, "%s not raised" % excName

        raise self.failureException("%s not raised" % excName)



    def _getAssertEqualityFunc(self, first, second):

        """Get a detailed comparison function for the types of the two args.

tests/regressiontests/admin_views/models.py

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ class BasePersonModelFormSet(BaseModelFormSet): 
            person = person_dict.get('id')

            alive = person_dict.get('alive')

            if person and alive and person.name == "Grace Hopper":

                raise forms.ValidationError, "Grace is not a Zombie"

                raise forms.ValidationError("Grace is not a Zombie")



class PersonAdmin(admin.ModelAdmin):

    list_display = ('name', 'gender', 'alive')

tests/regressiontests/queries/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class BaseQuerysetTest(TestCase): 
                excName = exc.__name__

            else:

                excName = str(exc)

            raise AssertionError, "%s not raised" % excName

            raise AssertionError("%s not raised" % excName)





class Queries1Tests(BaseQuerysetTest):