diff options
| -rw-r--r-- | chimere/forms.py | 11 | ||||
| -rw-r--r-- | chimere/utils.py | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/chimere/forms.py b/chimere/forms.py index 55f8527..efea3dd 100644 --- a/chimere/forms.py +++ b/chimere/forms.py @@ -32,10 +32,11 @@ from django.contrib.admin.widgets import AdminDateWidget from django.core.mail import EmailMessage, BadHeaderError from chimere.models import Marker, Route, PropertyModel, Property, Area,\ - News, Category, SubCategory, RouteFile, MultimediaFile, MultimediaType, \ - PictureFile, Importer, IMPORTER_CHOICES -from chimere.widgets import AreaField, PointField, TextareaWidget, ImportFiltrWidget,\ - TextareaAdminWidget, DatePickerWidget, ImporterChoicesWidget, RE_XAPI + News, Category, SubCategory, RouteFile, MultimediaFile, MultimediaType, \ + PictureFile, Importer, IMPORTER_CHOICES +from chimere.widgets import AreaField, PointField, TextareaWidget, \ + ImportFiltrWidget, TextareaAdminWidget, DatePickerWidget, \ + ImporterChoicesWidget, RE_XAPI from datetime import timedelta, datetime, tzinfo @@ -93,7 +94,7 @@ class OSMForm(forms.Form): """ OSM export form """ - username = forms.EmailField(label=_("OSM user")) + username = forms.CharField(label=_("OSM user")) password = forms.CharField(label=_(u"Password"), widget=forms.PasswordInput(render_value=False)) # API URL are hardcoded: the day the API change Chimère will need diff --git a/chimere/utils.py b/chimere/utils.py index 25b5900..bb24037 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -745,9 +745,9 @@ class OSMManager(ImportManager): password = extra_args['password'] except KeyError: return 0, _(u"Bad params - programming error") - api = OsmApi.OsmApi(api=api, - username=username, - password=password) + username = username.encode('latin1') + password = password.encode('latin1') + api = OsmApi.OsmApi(api=api, username=username, password=password) api.ChangesetCreate({u"comment": u"Import from Chimère %s" % \ get_version()}) hooks = RE_HOOK.findall(self.importer_instance.filtr) |