From 1f78824b4de907b1ab6510b81fbe46340c79ecdd Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 28 Feb 2012 22:26:09 +0000
Subject: [PATCH] Monotone-Parent: edfc795ccfa7cf0b564762207d8377e9a1d4e650
 Monotone-Revision: 09639e12aa5fbdcbeebb63070f77940c49f0aabd

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-02-28T22:26:09
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                            |  5 +++++
 OpenChange/gen-property-selectors.py | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 45c78dfc2..062361edc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/gen-property-selectors.py: bannedProps is now an
+	array instead of a dict of "True" values.
+
 2012-02-27  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreUserContext.m (-rootFolders:):
diff --git a/OpenChange/gen-property-selectors.py b/OpenChange/gen-property-selectors.py
index abf2fb283..845fd4bab 100755
--- a/OpenChange/gen-property-selectors.py
+++ b/OpenChange/gen-property-selectors.py
@@ -106,15 +106,15 @@ extern const enum MAPITAGS MAPIStoreSupportedProperties[];
 
 # hack: some properties have multiple and incompatible types. Sometimes those
 # props are not related at all...
-bannedProps = { "PrBodyHtml": True, "PrFavAutosubfolders": True,
-                "PrAttachDataObj": True, "PrAclTable": True,
-                "PrAclData": True, "PrRulesTable": True, "PrRulesData": True,
-                "PrDisableWinsock": True, "PrHierarchyServer": True,
-                "PrOfflineAddrbookEntryid": True,
-                "PrShorttermEntryidFromObject": True,
-                "PrNormalMessageSizeExtended": True,
-                "PrAssocMessageSizeExtended": True,
-                "PrMessageSizeExtended": True }
+bannedProps = [ "PrBodyHtml", "PrFavAutosubfolders",
+                "PrAttachDataObj", "PrAclTable",
+                "PrAclData", "PrRulesTable", "PrRulesData",
+                "PrDisableWinsock", "PrHierarchyServer",
+                "PrOfflineAddrbookEntryid",
+                "PrShorttermEntryidFromObject",
+                "PrNormalMessageSizeExtended",
+                "PrAssocMessageSizeExtended",
+                "PrMessageSizeExtended" ]
 
 def ParseExchangeH(names, lines):
     state = 0
@@ -151,7 +151,7 @@ def ParseExchangeHDefinition(names, line):
     propName = GenExchangeHName(stripped[0:eqIdx])
     if not propName.endswith("Error") and not propName.endswith("Unicode") \
              and not propName.startswith("PrProfile") \
-             and not bannedProps.has_key(propName):
+             and propName not in bannedProps:
         intIdx = stripped.find("(int", eqIdx)
         valueIdx = stripped.find("0x", intIdx + 1)
         endIdx = stripped.find(")", valueIdx)