Merge remote branch 'origin/HH-36683' into release-candidate

hhru · Sep 4, 2013 · 20a9901 · 20a9901
2 parents 3689e28 + 4d738b6
commit 20a9901
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/frontik/handler_xml.py b/frontik/handler_xml.py
@@ -31,7 +31,7 @@ def __init__(self, max_len=None, step=None, deepcopy=False):
 
         def __getitem__(self, key):
             val = dict.__getitem__(self, key)
-            if self.max_len:
+            if self.max_len is not None:
                 if self.step:
                     ind = self._order.index(key)
                     self._order.remove(key)
@@ -43,12 +43,12 @@ def __getitem__(self, key):
 
         def __setitem__(self, key, value):
             dict.__setitem__(self, key, value)
-            if self.max_len:
+            if self.max_len is not None:
                 if self.step:
                     self._order.insert(self.step, key)
                 else:
                     self._order.append(key)
-            if self.max_len and len(self._order) > self.max_len:
+            if self.max_len is not None and len(self._order) > self.max_len:
                 self.pop(self._order.pop(0))
 
     def __init__(self, root_dir, load_fn, max_len=None, step=None, deepcopy=False):
@@ -113,7 +113,7 @@ def load(self, filename):
 def make_file_cache(option_name, option_value, fun, max_len=None, step=None, deepcopy=False):
     if option_value:
         # disable cache in development environment
-        max_len = None if tornado.options.options.debug else max_len
+        max_len = 0 if tornado.options.options.debug else max_len
         return FileCache(option_value, fun, max_len, step, deepcopy)
     else:
         return InvalidOptionCache(option_name)