diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-02-27 20:44:52 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-17 13:21:27 +0200 |
commit | 86c03a98d11e93880b4568776e0939113a92a707 (patch) | |
tree | e07ad2e91e2544f7b2d61e8f3f653fdda26bfd52 /archaeological_files_pdl | |
parent | 52f442699a72ff5d0341a7d15d5b966a3cc2bd60 (diff) | |
download | Ishtar-86c03a98d11e93880b4568776e0939113a92a707.tar.bz2 Ishtar-86c03a98d11e93880b4568776e0939113a92a707.zip |
Migrate to python 3 - Clean old migrations and some old scripts
Diffstat (limited to 'archaeological_files_pdl')
-rw-r--r-- | archaeological_files_pdl/forms.py | 2 | ||||
-rw-r--r-- | archaeological_files_pdl/wizards.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 3b38e4fa5..6d67d6ac3 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -468,7 +468,7 @@ class FileFormInstruction(CustomForm, IshtarForm): if self.numeric_reference_is_readonly: self.fields['numeric_reference'].widget.attrs['readonly'] = True if reception_date and saisine_type: - if type(reception_date) in (unicode, str): + if type(reception_date) == str: try: reception_date = datetime.datetime.strptime( reception_date, '%d/%m/%Y') diff --git a/archaeological_files_pdl/wizards.py b/archaeological_files_pdl/wizards.py index 1506b5d49..d13811eea 100644 --- a/archaeological_files_pdl/wizards.py +++ b/archaeological_files_pdl/wizards.py @@ -76,14 +76,14 @@ class FileWizard(BaseFileWizard): self.session_get_value( 'preventivetype-' + self.url_name, 'permit_type')) permit_type = models.PermitType.objects.get(pk=idx) - context['permit_type'] = unicode(permit_type) - context['permit_type_code'] = unicode(permit_type.txt_idx) + context['permit_type'] = str(permit_type) + context['permit_type_code'] = str(permit_type.txt_idx) except (TypeError, ValueError, models.PermitType.DoesNotExist): pass elif self.steps.current == forminstruction: saisine_type = self.get_saisine_type() if saisine_type: - context['saisine_type'] = unicode(saisine_type) + context['saisine_type'] = str(saisine_type) context['saisine_type_delay'] = saisine_type.delay or 0 elif self.steps.current == formfinal: if self.steps.current.endswith('creation'): # creation only |