diff options
Diffstat (limited to 'archaeological_operations/forms.py')
| -rw-r--r-- | archaeological_operations/forms.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index b54a081d8..2d462c252 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -179,7 +179,7 @@ class ParcelForm(IshtarForm): grouped = [] for keys, parcel_grp in groupby(parcels, key=sortkeyfn): keys = list(keys) - keys.append([u' '.join([str(gp[-2]), str(gp[-1])]) + keys.append([' '.join([str(gp[-2]), str(gp[-1])]) for gp in parcel_grp]) grouped.append(keys) res = '' @@ -191,11 +191,11 @@ class ParcelForm(IshtarForm): c_section = '' if idx: res += " ; " - res += town + u' : ' + res += town + ' : ' if c_section: res += " / " c_section = section - res += section + u' ' + res += section + ' ' res += ", ".join(parcel_numbers) if year: res += " (%s)" % str(year) @@ -1825,7 +1825,7 @@ class GenerateDocForm(IshtarForm): if 'choices' in kwargs: choices = kwargs.pop('choices') super(GenerateDocForm, self).__init__(*args, **kwargs) - self.fields['doc_generation'].choices = [('', u'-' * 9)] + \ + self.fields['doc_generation'].choices = [('', '-' * 9)] + \ [(choice.pk, str(choice)) for choice in choices] |