Fixes #3916: Erroneous ONIX file.

[wolnelektury.git] / src / isbn / forms.py

diff --git a/src/isbn/forms.py b/src/isbn/forms.py
index 147be0b..47a72ba 100644 (file)
--- a/src/isbn/forms.py
+++ b/src/isbn/forms.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-from urllib2 import urlopen
+from datetime import date
+from urllib.request import urlopen

 
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from django import forms
 from django.utils.translation import ugettext_lazy as _

-from fnpdjango.utils.text.slughifi import slughifi
+from slugify import slugify

 
 from isbn.management.commands.import_onix import UNKNOWN
 from isbn.models import ONIXRecord, ISBNPool
 
 from isbn.management.commands.import_onix import UNKNOWN
 from isbn.models import ONIXRecord, ISBNPool


@@ -13,7 +14,7 @@ from librarian.parser import WLDocument
 
 class WLISBNForm(forms.Form):
     platform_url = forms.URLField(label=u'Adres na platformie')
 
 class WLISBNForm(forms.Form):
     platform_url = forms.URLField(label=u'Adres na platformie')

-    publishing_date = forms.DateField(label=u'Data publikacji')
+    publishing_date = forms.DateField(label=u'Data publikacji', initial=date.today)

 
     def prepare_data(self):
         platform_url = self.cleaned_data['platform_url']
 
     def prepare_data(self):
         platform_url = self.cleaned_data['platform_url']


@@ -85,7 +86,7 @@ class FNPISBNForm(forms.Form):
         return {'role': 'A01', 'name': output_name}
 
     def slug(self):
         return {'role': 'A01', 'name': output_name}
 
     def slug(self):

-        return slughifi('fnp %s %s' % (self.cleaned_data['authors'], self.cleaned_data['title']))
+        return slugify('fnp %s %s' % (self.cleaned_data['authors'], self.cleaned_data['title']))

 
     def save(self):
         data = {
 
     def save(self):
         data = {