From 40c477312dc061a2e740fe7889b998f2f23a2f4c Mon Sep 17 00:00:00 2001 From: hernani Date: Wed, 12 May 2010 10:22:03 +0000 Subject: [PATCH] Unknown user handling changes. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@233 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum_modules/sximporter/importer.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/forum_modules/sximporter/importer.py b/forum_modules/sximporter/importer.py index b5bb0a6..5d0c99b 100644 --- a/forum_modules/sximporter/importer.py +++ b/forum_modules/sximporter/importer.py @@ -55,24 +55,22 @@ def final_username_attempt(sxu): if openid: if google_accounts_lookup.search(openid): - return UnknownGoogleUser() + return UnknownGoogleUser(sxu.get('id')) if yahoo_accounts_lookup.search(openid): - return UnknownYahooUser() + return UnknownYahooUser(sxu.get('id')) for lookup in openid_lookups: if lookup.search(openid): return lookup.search(openid).group('uname') - return UnknownUser() + return UnknownUser(sxu.get('id')) class UnknownUser(object): - counter = 0 - def __init__(self): - self.__class__.counter += 1 - self.number = self.__class__.counter + def __init__(self, id): + self._id = id def __str__(self): - return _("Unknown user %(number)d") % {'number': self.number} + return _("user-%(id)d") % {'id': self._id} def __unicode__(self): return self.__str__() @@ -81,16 +79,12 @@ class UnknownUser(object): return self.__str__() class UnknownGoogleUser(UnknownUser): - counter = 0 - def __str__(self): - return _("Unknown google user %(number)d") % {'number': self.number} + return _("user-%(id)d (google)") % {'id': self._id} class UnknownYahooUser(UnknownUser): - counter = 0 - def __str__(self): - return _("Unknown yahoo user %(number)d") % {'number': self.number} + return _("user-%(id)d (yahoo)") % {'id': self._id} class IdMapper(dict): -- 2.39.5