Django 2.0

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

diff --git a/src/isbn/forms.py b/src/isbn/forms.py
index 147be0b..5f2940c 100644 (file)
--- a/src/isbn/forms.py
+++ b/src/isbn/forms.py
@@ -1,9 +1,10 @@
-# -*- coding: utf-8 -*-
-from urllib2 import urlopen
+from datetime import date
+import json
+from urllib.request import urlopen
 
 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
@@ -13,7 +14,7 @@ from librarian.parser import WLDocument
 
 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']
@@ -47,7 +48,7 @@ class WLConfirmForm(WLISBNForm):
         for file_format in data['formats']:
             data['product_form'] = PRODUCT_FORMS[file_format]
             data['product_form_detail'] = PRODUCT_FORM_DETAILS[file_format]
-            data['contributors'] = self.contributors(data)
+            data['contributors'] = json.dumps(self.contributors(data))
             ONIXRecord.new_record(purpose=ISBNPool.PURPOSE_WL, data=data)
         return data
 
@@ -85,14 +86,14 @@ class FNPISBNForm(forms.Form):
         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 = {
             'title': self.cleaned_data['title'],
             'language': self.cleaned_data['language'],
             'publishing_date': self.cleaned_data['publishing_date'],
-            'contributors': [self.prepare_author(a) for a in self.cleaned_data['authors'].split(',')],
+            'contributors': json.dumps([self.prepare_author(a) for a in self.cleaned_data['authors'].split(',')]),
             'edition_type': 'NED',
             'imprint': 'Fundacja Nowoczesna Polska',
             'dc_slug': self.slug(),