Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support Django 3 #111

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions geoposition/fields.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from __future__ import unicode_literals

from django.db import models
from django.utils.six import with_metaclass
from django.utils.translation import ugettext_lazy as _
from django.utils.encoding import smart_text

Expand Down Expand Up @@ -40,7 +39,7 @@ def to_python(self, value):

return Geoposition(latitude, longitude)

def from_db_value(self, value, expression, connection, context):
def from_db_value(self, value, expression, connection):
return self.to_python(value)

def get_prep_value(self, value):
Expand Down
3 changes: 1 addition & 2 deletions geoposition/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import json
from django import forms
from django.template.loader import render_to_string
from django.utils import six
from django.utils.translation import ugettext_lazy as _
from .conf import settings

Expand All @@ -17,7 +16,7 @@ def __init__(self, attrs=None):
super(GeopositionWidget, self).__init__(widgets, attrs)

def decompress(self, value):
if isinstance(value, six.text_type):
if isinstance(value, str):
return value.rsplit(',')
if value:
return [value.latitude, value.longitude]
Expand Down