Merge pull request #771 from Gluejar/dj18deprecations

Dj18deprecations

api/urls.py

@@ -40,7 +40,7 @@ urlpatterns = [
     url(r"^onix/(?P<facet>.*)/$", OnixView.as_view(), name="onix"),
     url(r"^onix/$", OnixView.as_view(), name="onix_all"),
     url(r'^id/work/(?P<work_id>\w+)/$', negotiate_content, name="work_identifier"),
-    url(r'^loader/yaml$',load_yaml, name="load_yaml"),
-    url(r'^travisci/webhook$',travisci_webhook, name="travisci_webhook"),
+    url(r'^loader/yaml$', load_yaml, name="load_yaml"),
+    url(r'^travisci/webhook$', travisci_webhook, name="travisci_webhook"),
     url(r'^', include(v1_api.urls)),
 ]

libraryauth/models.py

@@ -8,7 +8,7 @@ from django.core import validators
 from django.db import models
 from django.db.models import Q
 from django.db.models.signals import post_save
-from django.forms import IPAddressField as BaseIPAddressField
+from django.forms import GenericIPAddressField as BaseIPAddressField
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse