Attachment 8266 Details for Bug 33101

[patch] Use collection.MutableMapping instead of dict as base class

33101_ucr-dict-abc.diff (text/plain), 4.07 KB, created by Philipp Hahn on 2016-12-01 11:31 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2016-12-01 11:31 CET

Size: 4.07 KB

patch

obsolete

>diff --git a/base/univention-config-registry/python/univention/config_registry/backend.py b/base/univention-config-registry/python/univention/config_registry/backend.py
>index e45da65..b9163ff 100644
>--- a/base/univention-config-registry/python/univention/config_registry/backend.py
>+++ b/base/univention-config-registry/python/univention/config_registry/backend.py
>@@ -36,6 +36,7 @@ import fcntl
> import re
> import errno
> import time
>+from collections import MutableMapping
> 
> __all__ = ['StrictModeException', 'exception_occured',
> 		'SCOPE', 'ConfigRegistry']
>@@ -59,7 +60,7 @@ def exception_occured(out=sys.stderr):
> SCOPE = ['normal', 'ldap', 'schedule', 'forced', 'custom']
> 
> 
>-class ConfigRegistry(dict):
>+class ConfigRegistry(MutableMapping):
> 
> 	"""
> 	Merged persistent value store.
>@@ -75,7 +76,7 @@ class ConfigRegistry(dict):
> 	}
> 
> 	def __init__(self, filename=None, write_registry=NORMAL):
>-		dict.__init__(self)
>+		super(ConfigRegistry, self).__init__()
> 		self.file = os.getenv('UNIVENTION_BASECONF') or filename or None
> 		if self.file:
> 			self.scope = ConfigRegistry.CUSTOM
>@@ -145,8 +146,10 @@ class ConfigRegistry(dict):
> 		del registry[key]
> 
> 	def __getitem__(self, key):
>-		"""Return registry value."""
>-		return self.get(key)
>+		"""Return registry value.
>+		Bug: for historic reasons ucr[key] must return '' instead of raising KeyError - it would break all UCR templates!
>+		"""
>+		return self.get(key, '')
> 
> 	def __setitem__(self, key, value):
> 		"""Set registry value."""
>@@ -165,13 +168,16 @@ class ConfigRegistry(dict):
> 				return True
> 		return False
> 
>-	def iterkeys(self):
>+	def __iter__(self):
> 		"""Iterate over all registry keys."""
> 		merge = self._merge()
> 		for key in merge:
> 			yield key
> 
>-	__iter__ = iterkeys
>+	def __len__(self):
>+		"""Return length."""
>+		merge = self._merge()
>+		return len(merge)
> 
> 	def get(self, key, default=None, getscope=False):
> 		"""Return registry value (including optional scope)."""
>@@ -182,10 +188,6 @@ class ConfigRegistry(dict):
> 				ConfigRegistry.CUSTOM):
> 			try:
> 				registry = self._registry[reg]
>-				# BUG: _ConfigRegistry[key] does not raise a KeyError for unset
>-				# keys, but returns ''
>-				if key not in registry:
>-					continue
> 				value = registry[key]
> 				if getscope:
> 					return (reg, value)
>@@ -218,27 +220,9 @@ class ConfigRegistry(dict):
> 				continue
> 			for key, value in registry.items():
> 				if key not in merge:
>-					if getscope:
>-						merge[key] = (reg, value)
>-					else:
>-						merge[key] = registry[key]
>+					merge[key] = (reg, value) if getscope else value
> 		return merge
> 
>-	def items(self, getscope=False):
>-		"""Return all registry entries a 2-tuple (key, value)."""
>-		merge = self._merge(getscope=getscope)
>-		return merge.items()
>-
>-	def keys(self):
>-		"""Return all registry keys."""
>-		merge = self._merge()
>-		return merge.keys()
>-
>-	def values(self):
>-		"""Return all registry values."""
>-		merge = self._merge()
>-		return merge.values()
>-
> 	def __str__(self):
> 		"""Return registry content as string."""
> 		merge = self._merge()
>@@ -410,13 +394,6 @@ class _ConfigRegistry(dict):
> 		"""Un-lock sub registry file."""
> 		self.lock_file.close()
> 
>-	def __getitem__(self, key):
>-		"""Return value from sub registry."""
>-		try:
>-			return dict.__getitem__(self, key)
>-		except KeyError:
>-			return ''
>-
> 	def __setitem__(self, key, value):
> 		"""Set value in sub registry."""
> 		if self.strict_encoding:
>diff --git a/base/univention-config-registry/python/univention/config_registry/interfaces.py b/base/univention-config-registry/python/univention/config_registry/interfaces.py
>index 5baf398..87c403b 100644
>--- a/base/univention-config-registry/python/univention/config_registry/interfaces.py
>+++ b/base/univention-config-registry/python/univention/config_registry/interfaces.py
>@@ -193,10 +193,6 @@ class VengefulConfigRegistry(ConfigRegistry):
> 				ConfigRegistry.CUSTOM):
> 			try:
> 				registry = self._registry[reg]
>-				# BUG: _ConfigRegistry[key] does not raise a KeyError for unset
>-				# keys, but returns ''
>-				if key not in registry:
>-					raise KeyError(key)
> 				value = registry[key]
> 				return value
> 			except KeyError:

Actions: View | Diff

Attachments on bug 33101: 8266