Skip to content

Remove set_rollback() from compat #5591

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Nov 14, 2017
Merged

Conversation

rpkilby
Copy link
Member

@rpkilby rpkilby commented Nov 13, 2017

  • Remove Django < 1.6 compatibility code from set_rollback() and associated tests
  • Move set_rollback() to views (as it's only used by the exception handler)

@xordoquy
Copy link
Collaborator

Makes sense.
Do we have a test case that covers a rollback somewhere in the test suite ?

@rpkilby
Copy link
Member Author

rpkilby commented Nov 13, 2017

@xordoquy - it's indirectly covered in tests/test_atomic_requests.py.

Copy link
Collaborator

@carltongibson carltongibson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep. Looks good.

@carltongibson carltongibson added this to the v3.7.4 milestone Nov 14, 2017
@carltongibson carltongibson merged commit 15024f3 into encode:master Nov 14, 2017
@xordoquy
Copy link
Collaborator

@rpkilby nice work !

@rpkilby rpkilby deleted the rollback-compat branch November 14, 2017 15:30
pchiquet pushed a commit to pchiquet/django-rest-framework that referenced this pull request Nov 17, 2020
* Remove Django 1.6 transaction compat

* Move set_rollback from compat => views
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants