Ticket #6045: patch.diff

db/models/fields/related.py

@@ -4 +4 @@
 from django.db.models.related import RelatedObject
 from django.db.models.query import QuerySet
 from django.db.models.query_utils import QueryWrapper
-from django.utils.encoding import smart_unicode
+from django.utils.encoding import smart_unicode, smart_str
 from django.utils.translation import ugettext_lazy, string_concat, ungettext, ugettext as _
 from django.utils.functional import curry
 from django.core import exceptions
@@ -362 +362 @@
         def __init__(self, model=None, core_filters=None, instance=None, symmetrical=None,
                 join_table=None, source_col_name=None, target_col_name=None):
             super(ManyRelatedManager, self).__init__()
-            self.core_filters = core_filters
+            self.core_filters = {}
+            if core_filters:
+                for key, value in core_filters.items():
+                    if not isinstance(key, str):
+                        key = smart_str(key)
+                    self.core_filters[key] = value
             self.model = model
             self.symmetrical = symmetrical
             self.instance = instance