Update bencode function so it also handles nested mongoengine BaseDic…

…t types.
StackStorm · Aug 27, 2015 · 03fdb94 · 03fdb94
1 parent 6dfc5a3
commit 03fdb94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/st2common/st2common/models/db/trigger.py b/st2common/st2common/models/db/trigger.py
@@ -89,8 +89,8 @@ def get_uid(self):
         uid = super(TriggerDB, self).get_uid()
 
         parameters = getattr(self, 'parameters', {})
-        parameters = dict(parameters)
-        parameters = hashlib.md5(bencode.bencode(parameters)).hexdigest()
+        parameters = bencode.bencode(parameters)
+        parameters = hashlib.md5(parameters).hexdigest()
 
         uid = uid + self.UID_SEPARATOR + parameters
         return uid

diff --git a/st2common/st2common/util/bencode.py b/st2common/st2common/util/bencode.py
@@ -21,6 +21,8 @@
 
 from types import UnicodeType
 
+from mongoengine.base.datastructures import BaseDict
+
 import bencode as bencode_upstream
 
 __all__ = [
@@ -35,6 +37,7 @@ def encode_unicode(x, r):
 
 # Patch bencode so it also knows how to encode unicode types
 bencode_upstream.encode_func[UnicodeType] = encode_unicode
+bencode_upstream.encode_func[BaseDict] = bencode_upstream.encode_dict
 
 
 def bencode(x):