Skip to content

Make it compatible with python < 2.7 + bugfix in utils #35

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 17, 2014
+5 −5
Merged

Make it compatible with python < 2.7 + bugfix in utils #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
41b6a1a
Use correct dict init for versions < 2.7
Nov 14, 2014
acf1ef8
The primary key of a model can be a string --> changed syntax for bas…
Nov 14, 2014
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
10 changes: 5 additions & 5 deletions django_pandas/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def inner(values):


def get_base_cache_key(model):
return 'pandas_%s_%s_%%d_rendering' % (
return 'pandas_%s_%s_%%s_rendering' % (
model._meta.app_label, model._meta.module_name)


Expand Down Expand Up @@ -45,9 +45,9 @@ def inner(pk_series):
out_dict = cache.get_many(unique_cache_keys)

if len(out_dict) < len(unique_cache_keys):
out_dict = {base_cache_key % obj.pk: force_text(obj)
out_dict = dict([(base_cache_key % obj.pk, force_text(obj))
for obj in model.objects.filter(
pk__in=list(filter(None, pk_series.unique())))}
pk__in=list(filter(None, pk_series.unique())))])
cache.set_many(out_dict)

return list(map(out_dict.get, cache_keys))
Expand All @@ -58,8 +58,8 @@ def inner(pk_series):
def build_update_functions(fieldnames, fields):
for fieldname, field in zip(fieldnames, fields):
if field.choices:
choices = {k: force_text(v)
for k, v in field.flatchoices}
choices = dict([(k, force_text(v))
for k, v in field.flatchoices])
yield fieldname, replace_from_choices(choices)

elif field.get_internal_type() == 'ForeignKey':
Expand Down