diff --git a/frappe/__init__.py b/frappe/__init__.py index 1c528606e5..779518daa4 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1045,7 +1045,7 @@ def publish_realtime(*args, **kwargs): return frappe.async.publish_realtime(*args, **kwargs) -def local_cache(namespace, key, generator): +def local_cache(namespace, key, generator, regenerate_if_none=False): """A key value store for caching within a request :param namespace: frappe.local.cache[namespace] @@ -1059,4 +1059,8 @@ def local_cache(namespace, key, generator): if key not in local.cache[namespace]: local.cache[namespace][key] = generator() + elif local.cache[namespace][key]==None and regenerate_if_none: + # if key exists but the previous result was None + local.cache[namespace][key] = generator() + return local.cache[namespace][key] diff --git a/frappe/__version__.py b/frappe/__version__.py index 33517613e7..43021d8be7 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "6.6.0" +__version__ = "6.6.1" diff --git a/frappe/hooks.py b/frappe/hooks.py index b1eade486e..878d942380 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -26,7 +26,7 @@ to ERPNext. """ app_icon = "octicon octicon-circuit-board" -app_version = "6.6.0" +app_version = "6.6.1" app_color = "orange" github_link = "https://github.com/frappe/frappe" diff --git a/setup.py b/setup.py index 442b1ada9a..e7458bd562 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup, find_packages -version = "6.6.0" +version = "6.6.1" with open("requirements.txt", "r") as f: install_requires = f.readlines()