[gentoo-commits] proj/R_overlay:master commit in: roverlay/overlay/pkgdir/metadata/

["André Erdmann" <dywi@mailerd.de>]

commit:     37357f6a8b38332a3d061a38f6fb14484aa46eaf
Author:     André Erdmann <dywi <AT> mailerd <DOT> de>
AuthorDate: Sun Mar 17 15:17:59 2013 +0000
Commit:     André Erdmann <dywi <AT> mailerd <DOT> de>
CommitDate: Sun Mar 17 16:06:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=37357f6a

overlay/pkgdir/metadata: use additional_filter

Pass a filter function to strutil.ascii_filter() instead of editing the
value string twice.

---
 roverlay/overlay/pkgdir/metadata/abstractnodes.py |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/roverlay/overlay/pkgdir/metadata/abstractnodes.py b/roverlay/overlay/pkgdir/metadata/abstractnodes.py
index 2cb67ca..465973a 100644
--- a/roverlay/overlay/pkgdir/metadata/abstractnodes.py
+++ b/roverlay/overlay/pkgdir/metadata/abstractnodes.py
@@ -16,7 +16,7 @@ __all__ = [ 'MetadataLeaf', 'MetadataNode',
 ]
 
 from roverlay import strutil
-import re
+
 import textwrap
 
 INDENT = '\t'
@@ -211,11 +211,15 @@ class MetadataLeaf ( _MetadataBasicNode ):
 
 	def _default_value_str ( self ):
 		"""Returns the value string. Derived classes may override this."""
+		def char_allowed ( c ):
+			return c not in self.__class__.INVALID_CHARS
+		# --- end of char_allowed (...) ---
+
 		#if self.value_format == ?: format value ~
-		return re.sub (
-			"[" + self.__class__.INVALID_CHARS + "]",
-			'',
-			strutil.ascii_filter ( str ( self.value ) )
+
+		return strutil.ascii_filter (
+				str ( self.value ),
+				additional_filter = char_allowed
 		)
 	# --- end of _value_str (...) ---