From c7efb761d5e2b970fc00407ab8ae37870c553759 Mon Sep 17 00:00:00 2001 From: Josh Karlin Date: Mon, 29 Mar 2010 13:40:37 +0000 Subject: [PATCH] Merged trunk into branch. -r 17471:17503 --- Makefile | 4 ++-- sfa/util/faults.py | 2 +- sfa/util/namespace.py | 2 +- sfa/util/table.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b3602ed8..3d3fc9a0 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,8 @@ keyconvert-clean: python: xmlbuilder-install: - cd xmlbuilder-0.9 ; python setup.py install ; cd .. - + cd xmlbuilder-0.9 && python setup.py install --root=$(DESTDIR) && cd - + python-install: python setup.py install --root=$(DESTDIR) chmod 444 $(DESTDIR)/etc/sfa/default_config.xml diff --git a/sfa/util/faults.py b/sfa/util/faults.py index 045e443a..8e5ece1c 100644 --- a/sfa/util/faults.py +++ b/sfa/util/faults.py @@ -11,7 +11,7 @@ import xmlrpclib class SfaFault(xmlrpclib.Fault): def __init__(self, faultCode, faultString, extra = None): if extra: - faultString += ": " + extra + faultString += ": " + str(extra) xmlrpclib.Fault.__init__(self, faultCode, faultString) class SfaInvalidAPIMethod(SfaFault): diff --git a/sfa/util/namespace.py b/sfa/util/namespace.py index cc140d5a..e3a7536f 100644 --- a/sfa/util/namespace.py +++ b/sfa/util/namespace.py @@ -45,7 +45,7 @@ def slicename_to_hrn(auth_hrn, slicename): def email_to_hrn(auth_hrn, email): parts = email.split("@") username = parts[0] - username = username.replace(".", "_") + username = username.replace(".", "_").replace("+", "_") person_hrn = ".".join([auth_hrn, username]) return person_hrn diff --git a/sfa/util/table.py b/sfa/util/table.py index 7eea14a7..bccda20d 100644 --- a/sfa/util/table.py +++ b/sfa/util/table.py @@ -186,5 +186,5 @@ class SfaTable(list): except: pass - def sfa_records_purge(): + def sfa_records_purge(self): self.drop() -- 2.47.0