From a57f28ac832041ccb5c21cb7713c9723a3fd672f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alice=20Bevan=E2=80=93McGregor?= <alice@gothcandy.com>
Date: Tue, 13 Oct 2015 22:41:58 -0400
Subject: [PATCH] Correction for local monkeypatch.

---
 mongoengine/base/fields.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongoengine/base/fields.py b/mongoengine/base/fields.py
index 9f054a2b..d14ecce0 100644
--- a/mongoengine/base/fields.py
+++ b/mongoengine/base/fields.py
@@ -83,7 +83,7 @@ class BaseField(object):
         self._owner_document = None
         
         # Detect and report conflicts between metadata and base properties.
-        conflicts = set(dir(self)).intersect(kwargs)
+        conflicts = set(dir(self)) & set(kwargs)
         if conflicts:
             raise TypeError("%s already has attribute(s): %s" % (
                 self.__class__.__name__, ', '.join(conflicts) ))