From 356443fd956c45e66c24256edc8f673d773b6ac8 Mon Sep 17 00:00:00 2001
From: Simon Charette <charette.s@gmail.com>
Date: Thu, 18 Apr 2013 01:55:12 -0400
Subject: [PATCH] Use `LOOKUP_SEP` in `get_or_create`.

---
 django/db/models/query.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/django/db/models/query.py b/django/db/models/query.py
index aec62c5c20..c36d81cc31 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -466,14 +466,14 @@ class QuerySet(object):
             return self.get(**lookup), False
         except self.model.DoesNotExist:
             try:
-                params = dict([(k, v) for k, v in kwargs.items() if '__' not in k])
+                params = dict((k, v) for k, v in kwargs.items() if LOOKUP_SEP not in k)
                 params.update(defaults)
                 obj = self.model(**params)
                 sid = transaction.savepoint(using=self.db)
                 obj.save(force_insert=True, using=self.db)
                 transaction.savepoint_commit(sid, using=self.db)
                 return obj, True
-            except IntegrityError as e:
+            except IntegrityError:
                 transaction.savepoint_rollback(sid, using=self.db)
                 exc_info = sys.exc_info()
                 try: