Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jpadilla/django-rest-framework-oauth
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: iCHEF/django-rest-framework-oauth
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 18, 2022

  1. remove six

    @timtan
    timtan committed Jun 18, 2022
    Copy the full SHA
    b3b5cb6 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 requirements.txt
  2. +1 −1 rest_framework_oauth/compat.py
2 changes: 1 addition & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -6,4 +6,4 @@ flake8==2.2.2
oauth2==1.5.211
pytest-cov==1.6
pytest-django==2.6
pytest==2.5.2
pytest==2.5.2
2 changes: 1 addition & 1 deletion rest_framework_oauth/compat.py
View file
Original file line number Diff line number Diff line change
@@ -5,10 +5,10 @@

# flake8: noqa
from __future__ import unicode_literals

import django
import inspect

from django.utils import six
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured