Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Upgrade to Django 4.1 #63

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 2 additions & 18 deletions PasswordReset/PasswordReset/urls.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,5 @@
"""PasswordReset URL Configuration

The `urlpatterns` list routes URLs to views. For more information please see:
https://docs.djangoproject.com/en/1.11/topics/http/urls/
Examples:
Function views
1. Add an import: from my_app import views
2. Add a URL to urlpatterns: url(r'^$', views.home, name='home')
Class-based views
1. Add an import: from other_app.views import Home
2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home')
Including another URLconf
1. Import the include() function: from django.conf.urls import url, include
2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls'))
"""

from django.conf.urls import url, include
from django.urls import include, path

urlpatterns = [
url(r'reset/', include('app.urls')),
path('reset/', include('app.urls')),
]
1 change: 0 additions & 1 deletion PasswordReset/app/pwdmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

from ipalib import api, errors as ipaerrors
import redis
import re
import subprocess
from random import SystemRandom
from datetime import datetime, timedelta
Expand Down
2 changes: 0 additions & 2 deletions PasswordReset/app/templates/base.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
{% load staticfiles %}

<!DOCTYPE html>
<html>

Expand Down
9 changes: 5 additions & 4 deletions PasswordReset/app/urls.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from django.conf.urls import url
from django.urls import path

from . import views
from .views import *

urlpatterns = [
url(r'^$', views.index, name='index'),
url(r'^gettoken/$', GetToken.as_view(), name='gettoken'),
url(r'^setpassword/$', SetPassword.as_view(), name='setpassword'),
path('', views.index, name='index'),
path('gettoken/', GetToken.as_view(), name='gettoken'),
path('setpassword/', SetPassword.as_view(), name='setpassword'),
]
3 changes: 1 addition & 2 deletions PasswordReset/app/views.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals

from django.shortcuts import render, redirect
from django.shortcuts import redirect
from django.http import HttpResponse
from django.views.generic import View
from django.template import loader
from django.utils.safestring import mark_safe

from .pwdmanager import *
from django.conf import settings

def index(request):
template = loader.get_template('index.html')
Expand Down
52 changes: 33 additions & 19 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,33 @@
appdirs==1.4.3
boto3==1.4.4
botocore==1.5.71
decorator==4.0.11
django==1.11.29
dnspython==1.15.0
docutils==0.13.1
futures==3.1.1
httplib2==0.18.0
jmespath==0.9.3
packaging==16.8
python-dateutil==2.6.0
pytz==2017.2
redis==2.10.5
rsa==3.4.2
s3transfer==0.1.10
six==1.10.0
uritemplate==3.0.0
Jinja2==2.10.1
asgiref==3.6.0
async-timeout==4.0.2
boto3==1.26.73
botocore==1.29.73
certifi==2022.12.7
cffi==1.15.1
charset-normalizer==3.0.1
cryptography==37.0.4
decorator==5.1.1
Django==4.1.7
dnspython==2.3.0
gssapi==1.8.2
gunicorn==20.1.0
idna==3.4
ipaclient==4.8.9
ipalib==4.8.9
ipaplatform==4.8.9
ipapython==4.8.9
jmespath==1.0.1
netaddr==0.8.0
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycparser==2.21
pypng==0.20220715.0
python-dateutil==2.8.2
qrcode==7.4.2
redis==4.5.1
requests==2.28.2
s3transfer==0.6.0
six==1.16.0
sqlparse==0.4.3
typing_extensions==4.5.0
urllib3==1.26.14