824968 - models undefined in apps/sumo/monkeypatch.py

Status: RESOLVED FIXED

(support.mozilla.org :: Code Quality, task)

Description

[Will Kahn-Greene [:willkg] ET needinfo? me]

I'm running the tests and (probably for other reasons) triggered the error exception in monkeypatch.py that's got a bug in it:

ERROR: kitsune.apps.forums.tests.test_notifications:NotificationsTests.test_admin_delete_user_with_watched_thread
  vim +344  apps/forums/tests/test_notifications.py  # test_admin_delete_user_with_watched_thread
    ModelAdmin(User, admin.site).delete_view(request, str(u.id))
  vim +25   vendor/src/django/django/utils/decorators.py  # _wrapper
    return bound_func(*args, **kwargs)
  vim +91   vendor/src/django/django/utils/decorators.py  # _wrapped_view
    response = view_func(request, *args, **kwargs)
  vim +21   vendor/src/django/django/utils/decorators.py  # bound_func
    return func(self, *args2, **kwargs2)
  vim +209  vendor/src/django/django/db/transaction.py  # inner
    return func(*args, **kwargs)
  vim +1274 vendor/src/django/django/contrib/admin/options.py  # delete_view
    [obj], opts, request.user, self.admin_site, using)
  vim +104  vendor/src/django/django/contrib/admin/util.py  # get_deleted_objects
    collector.collect(objs)
  vim +70   apps/sumo/monkeypatch.py  # _collect
    except models.ProtectedError, e:
NameError: global name 'models' is not defined


There are two problems there:

1. models isn't defined in that file, but should be (that's a one-line fix)
2. we should be using the new exception handling syntax:

      except models.ProtectedError as e:  # GOOD!

   instead of the old buggy one:

      except models.ProtectedError, e:  # BAD!

Comment 1

[Ricky Rosario [:rrosario, :r1cky]]

In a pull request.

Comment 2

[Ricky Rosario [:rrosario, :r1cky]]

Pull request:
https://github.com/mozilla/kitsune/pull/1027

Landed on master:
https://github.com/mozilla/kitsune/commit/e57809cbfebf3b8f491ad3f78effaa5f8a06d9bc

Comment 3

[Ricky Rosario [:rrosario, :r1cky]]

This was deployed today.