Skip to content

Commit f0967a7

Browse files
committed
delete old version of Django code
1 parent ece62fa commit f0967a7

File tree

2 files changed

+10
-33
lines changed

2 files changed

+10
-33
lines changed

dj_elastictranscoder/models.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
from django.db import models
2+
from django.contrib.contenttypes.fields import GenericForeignKey
23
from django.contrib.contenttypes.models import ContentType
34

4-
import django
5-
if django.VERSION >= (1, 8):
6-
from django.contrib.contenttypes.fields import GenericForeignKey
7-
else:
8-
from django.contrib.contenttypes.generic import GenericForeignKey
9-
105

116
class EncodeJob(models.Model):
127
STATE_CHOICES = (

dj_elastictranscoder/urls.py

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,9 @@
1-
import django
2-
3-
4-
if django.VERSION >= (1, 9):
5-
from django.conf.urls import url
6-
from dj_elastictranscoder import views
7-
8-
urlpatterns = [
9-
url(r'^endpoint/$', views.aws_endpoint),
10-
url(r'^aws_endpoint/$', views.aws_endpoint, name='aws_endpoint'),
11-
url(r'^qiniu_endpoint/$', views.qiniu_endpoint, name='qiniu_endpoint'),
12-
url(r'^aliyun_endpoint', views.aliyun_endpoint, name='aliyun_endpoint'),
13-
]
14-
15-
else:
16-
try:
17-
from django.conf.urls import url, patterns
18-
except ImportError:
19-
from django.conf.urls.defaults import url, patterns # Support for Django < 1.4
20-
21-
urlpatterns = patterns(
22-
'dj_elastictranscoder.views',
23-
url(r'^endpoint/$', 'aws_endpoint'),
24-
url(r'^aws_endpoint/$', 'aws_endpoint', name='aws_endpoint'),
25-
url(r'^qiniu_endpoint/$', 'qiniu_endpoint', name='qiniu_endpoint'),
26-
url(r'^aliyun_endpoint', 'aliyun_endpoint', name='aliyun_endpoint'),
27-
)
1+
from django.conf.urls import url
2+
from dj_elastictranscoder import views
3+
4+
urlpatterns = [
5+
url(r'^endpoint/$', views.aws_endpoint),
6+
url(r'^aws_endpoint/$', views.aws_endpoint, name='aws_endpoint'),
7+
url(r'^qiniu_endpoint/$', views.qiniu_endpoint, name='qiniu_endpoint'),
8+
url(r'^aliyun_endpoint', views.aliyun_endpoint, name='aliyun_endpoint'),
9+
]

0 commit comments

Comments
 (0)