On 02/03/2010 05:07 AM, Jason Gerard DeRose wrote:
Could you submit this again?
Done, attached.
--
John Dennis <jden...@redhat.com>
Looking to carve out IT costs?
www.redhat.com/carveoutcosts/
From 6d65b8faeb6ec69bfba4e7674ce1fa4379b959c9 Mon Sep 17 00:00:00 2001
From: John Dennis <jden...@redhat.com>
Date: Thu, 28 Jan 2010 11:19:58 -0500
Subject: [PATCH 1/6] Remove (un)wrap_binary_data cruft from */ipautil.py
Remove SAFE_STRING_PATTERN, safe_string_re, needs_base64(),
wrap_binary_data(), unwrap_binary_data() from both instances
of ipautil.py. This code is no longer in use and the
SAFE_STRING_PATTERN regular expression string was causing xgettext
to abort because it wasn't a valid ASCII string.
---
ipapython/ipautil.py | 62 --------------------------------------------------
ipaserver/ipautil.py | 62 --------------------------------------------------
2 files changed, 0 insertions(+), 124 deletions(-)
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 1399c70..7c41d78 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -284,68 +284,6 @@ class CIDict(dict):
return (key,value)
-#
-# The safe_string_re regexp and needs_base64 function are extracted from the
-# python-ldap ldif module, which was
-# written by Michael Stroeder <mich...@stroeder.com>
-# http://python-ldap.sourceforge.net
-#
-# It was extracted because ipaldap.py is naughtily reaching into the ldif
-# module and squashing this regexp.
-#
-SAFE_STRING_PATTERN = '(^(\000|\n|\r| |:|<)|[\000\n\r\200-\377]+|[ ]+$)'
-safe_string_re = re.compile(SAFE_STRING_PATTERN)
-
-def needs_base64(s):
- """
- returns 1 if s has to be base-64 encoded because of special chars
- """
- return not safe_string_re.search(s) is None
-
-
-def wrap_binary_data(data):
- """Converts all binary data strings into Binary objects for transport
- back over xmlrpc."""
- if isinstance(data, str):
- if needs_base64(data):
- return xmlrpclib.Binary(data)
- else:
- return data
- elif isinstance(data, list) or isinstance(data,tuple):
- retval = []
- for value in data:
- retval.append(wrap_binary_data(value))
- return retval
- elif isinstance(data, dict):
- retval = {}
- for (k,v) in data.iteritems():
- retval[k] = wrap_binary_data(v)
- return retval
- else:
- return data
-
-
-def unwrap_binary_data(data):
- """Converts all Binary objects back into strings."""
- if isinstance(data, xmlrpclib.Binary):
- # The data is decoded by the xmlproxy, but is stored
- # in a binary object for us.
- return str(data)
- elif isinstance(data, str):
- return data
- elif isinstance(data, list) or isinstance(data,tuple):
- retval = []
- for value in data:
- retval.append(unwrap_binary_data(value))
- return retval
- elif isinstance(data, dict):
- retval = {}
- for (k,v) in data.iteritems():
- retval[k] = unwrap_binary_data(v)
- return retval
- else:
- return data
-
class GeneralizedTimeZone(datetime.tzinfo):
"""This class is a basic timezone wrapper for the offset specified
in a Generalized Time. It is dst-ignorant."""
diff --git a/ipaserver/ipautil.py b/ipaserver/ipautil.py
index 7042c1c..cd0fdb5 100644
--- a/ipaserver/ipautil.py
+++ b/ipaserver/ipautil.py
@@ -116,68 +116,6 @@ class CIDict(dict):
return (key, value)
-#
-# The safe_string_re regexp and needs_base64 function are extracted from the
-# python-ldap ldif module, which was
-# written by Michael Stroeder <mich...@stroeder.com>
-# http://python-ldap.sourceforge.net
-#
-# It was extracted because ipaldap.py is naughtily reaching into the ldif
-# module and squashing this regexp.
-#
-SAFE_STRING_PATTERN = '(^(\000|\n|\r| |:|<)|[\000\n\r\200-\377]+|[ ]+$)'
-safe_string_re = re.compile(SAFE_STRING_PATTERN)
-
-def needs_base64(s):
- """
- returns 1 if s has to be base-64 encoded because of special chars
- """
- return not safe_string_re.search(s) is None
-
-
-def wrap_binary_data(data):
- """Converts all binary data strings into Binary objects for transport
- back over xmlrpc."""
- if isinstance(data, str):
- if needs_base64(data):
- return xmlrpclib.Binary(data)
- else:
- return data
- elif isinstance(data, list) or isinstance(data,tuple):
- retval = []
- for value in data:
- retval.append(wrap_binary_data(value))
- return retval
- elif isinstance(data, dict):
- retval = {}
- for (k, v) in data.iteritems():
- retval[k] = wrap_binary_data(v)
- return retval
- else:
- return data
-
-
-def unwrap_binary_data(data):
- """Converts all Binary objects back into strings."""
- if isinstance(data, xmlrpclib.Binary):
- # The data is decoded by the xmlproxy, but is stored
- # in a binary object for us.
- return str(data)
- elif isinstance(data, str):
- return data
- elif isinstance(data, list) or isinstance(data,tuple):
- retval = []
- for value in data:
- retval.append(unwrap_binary_data(value))
- return retval
- elif isinstance(data, dict):
- retval = {}
- for (k, v) in data.iteritems():
- retval[k] = unwrap_binary_data(v)
- return retval
- else:
- return data
-
def get_gsserror(e):
"""A GSSError exception looks differently in python 2.4 than it does
in python 2.5, deal with it."""
--
1.6.6
_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel
