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

Modified the package for importing python_2_unicode_compatible from django.utils.encoding to six for jet and dashboard #501

Open
wants to merge 3 commits into
base: dev
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: 2 additions & 1 deletion jet/dashboard/models.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
from importlib import import_module
import json
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
from six import python_2_unicode_compatible

from django.utils.translation import ugettext_lazy as _
from jet.utils import LazyDateTimeEncoder

Expand Down
4 changes: 2 additions & 2 deletions jet/models.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from django.db import models
from django.utils import timezone
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
from six import python_2_unicode_compatible

from django.utils.translation import ugettext_lazy as _

@python_2_unicode_compatible
class Bookmark(models.Model):
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"select2": "4.0.0",
"timepicker": "git://github.com/geex-arts/timepicker",
"vinyl-buffer": "1.0.0",
"vinyl-source-stream": "1.1.0"
"vinyl-source-stream": "1.1.0",
"six":"1.16.0"
}
}