Use vCard fullname if nickname isn't around.

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@127 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/src/avatar.py b/src/avatar.py
index ef479400f9229147a122b3f78c58757d71014997..ab8b43f38b7536bc1c280c2dd87793407c97f143 100644 (file)
--- a/src/avatar.py
+++ b/src/avatar.py
@@ -1,17 +1,16 @@
 # Copyright 2005 James Bunton <james@delx.cjb.net>
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
-import utils
-import config
+from debug import LogEvent, INFO, WARN, ERROR
+
 from twisted.internet import reactor
 from tlib.xmlw import Element
-from debug import LogEvent, INFO, WARN, ERROR
+
+import sha, base64, os, os.path
+
+import utils
 import config
-import lang
-import sha
-import base64
-import os
-import os.path
+
 
 SPOOL_UMASK = 0077
 
@@ -49,8 +48,8 @@ class Avatar:
        def makePhotoElement(self):
                """ Returns an XML Element that can be put into the vCard. """
                photo = Element((None, "PHOTO"))
-               type = photo.addElement("TYPE")
-               type.addContent("image/png")
+               cType = photo.addElement("TYPE")
+               cType.addContent("image/png")
                binval = photo.addElement("BINVAL")
                binval.addContent(base64.encodestring(self.getImageData()))
                return photo
@@ -100,6 +99,8 @@ class AvatarCache:
                imageData = self.getAvatarData(key)
                if imageData:
                        return Avatar(imageData, self)
+               else:
+                       return None
        
        def getAvatarData(self, key):
                """ Loads the avatar with SHA1 hash of 'key' from disk and returns the data """
@@ -113,8 +114,10 @@ class AvatarCache:
                                return data
                        else:
                                LogEvent(INFO, "", "Avatar not found.")
-               except IOError, e:
+               except IOError:
                        LogEvent(WARN, "", "IOError reading avatar.")
+               else:
+                       return None
 
 
 

diff --git a/src/config.py b/src/config.py
index bd513d0a1dbe7db30b0533a2d67166c769dc25a8..dca4a70ea8c105decd87fe8d2530175bd21bf59a 100644 (file)
--- a/src/config.py
+++ b/src/config.py
@@ -33,4 +33,5 @@ background = False
 pid = ""
 
 debugLevel = "0" # 0->None, 1->Traceback, 2->WARN,ERROR, 3->INFO,WARN,ERROR
+_debugLevel = 0 # Maintained by debug.reloadConfig as an int
 debugFile = ""

diff --git a/src/contact.py b/src/contact.py
index a4a216a900156b7b6cbed71e0897f2d53b2d8ca6..2e58902e7a410553eb5ce3c5f610086d0189e4e9 100644 (file)
--- a/src/contact.py
+++ b/src/contact.py
@@ -1,16 +1,13 @@
 # Copyright 2005 James Bunton <james@delx.cjb.net>
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
-import utils
+from debug import LogEvent, INFO, WARN, ERROR
+
 from twisted.internet import reactor
 from tlib.xmlw import Element
-from debug import LogEvent, INFO, WARN, ERROR
+
 import disco
 import legacy
-import jabw
-import config
-import lang
-import sha
 
 
 class Contact:

diff --git a/src/debug.py b/src/debug.py
index 4da2bbf14d484c435408f62bf24b50924e8d6eaa..0f90522e631b8e37bb2c8be0ef7eb076bdbc4ffd 100644 (file)
--- a/src/debug.py
+++ b/src/debug.py
@@ -2,6 +2,7 @@
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
 from twisted.python import log
+
 import sys, time
 
 import config

diff --git a/src/disco.py b/src/disco.py
index 3fb2fc90d4d4efe7a45933c0f3625e4fc5ff74d6..3e93a9b017750cc2d298e91edc78ee57970bf081 100644 (file)
--- a/src/disco.py
+++ b/src/disco.py
@@ -1,15 +1,17 @@
 # Copyright 2004-2005 James Bunton <james@delx.cjb.net>
 # Licensed for distribution under the GPL version 2, check COPYING for details
 
-import utils
-from tlib.xmlw import Element, jid
+from debug import LogEvent, INFO, WARN, ERROR
+
 from twisted.internet.defer import Deferred
 from twisted.internet import reactor
-from debug import LogEvent, INFO, WARN, ERROR
+from tlib.xmlw import Element, jid
+
 import sys
-import config
-import legacy
+
 import lang
+import utils
+import config
 
 XMPP_STANZAS  = "urn:ietf:params:xml:ns:xmpp-stanzas"
 DISCO         = "http://jabber.org/protocol/disco"
@@ -113,7 +115,7 @@ class ServerDiscovery:
                try: # Stringprep
                        froj = jid.intern(fro)
                        to = jid.intern(to).full()
-               except Exception, e:
+               except Exception:
                        LogEvent(WARN, "", "Dropping IQ because of stringprep error")
 
                # Check if it's a response to a send IQ

diff --git a/src/session.py b/src/session.py
index df5557e08dc958aac871a82b91daf92395cfc489..c876fe7a3658721ec60287ba8128eb87fd7b0799 100644 (file)
--- a/src/session.py
+++ b/src/session.py
@@ -118,9 +118,13 @@ class Session(jabw.JabberConnection):
                                self.legacycon.updateAvatar() # Default avatar
                                return
                        avatarSet = False
+                       name = ""
                        for e in vCard.elements():
                                if e.name == "NICKNAME":
-                                       self.updateNickname(e.__str__())
+                                       name = e.__str__()
+                               if not name and e.name == "FN":
+                                       # Give priority to nickname
+                                       name = e.__str__()
                                if e.name == "PHOTO":
                                        imageData = avatar.parsePhotoEl(e)
                                        if not imageData:
@@ -128,6 +132,8 @@ class Session(jabw.JabberConnection):
                                        self.avatar = self.pytrans.avatarCache.setAvatar(imageData)
                                        self.legacycon.updateAvatar(self.avatar)
                                        avatarSet = True
+                       if name:
+                               self.updateNickname(e.__str__())
                        if not avatarSet:
                                self.legacycon.updateAvatar() # Default avatar
 

diff --git a/src/tlib/msn/msnw.py b/src/tlib/msn/msnw.py
index 15e47836d38ff6a81fd7e7568a78cda48369d758..6b58f50ed0097698ccb2621451218dc5bce07e87 100644 (file)
--- a/src/tlib/msn/msnw.py
+++ b/src/tlib/msn/msnw.py
@@ -7,7 +7,7 @@ from twisted.internet.defer import Deferred
 from twisted.internet.protocol import ClientFactory
 
 # System imports
-import math, base64, binascii, math
+import math, base64, binascii
 
 # Local imports
 from debug import LogEvent, INFO, WARN, ERROR

diff --git a/src/xmlconfig.py b/src/xmlconfig.py
index e8758b529edfe81e6c2a6433dd5d8c438dc419ca..ea3065520af91794143e9c6bccc8cf14823ad42a 100644 (file)
--- a/src/xmlconfig.py
+++ b/src/xmlconfig.py
@@ -61,7 +61,7 @@ def importOptions(options):
                if hasattr(config, o):
                        setattr(config, o, options[0])
                else:
-                       print "Option %s is not a defined option. Ignoring!" % (tag)
+                       print "Option %s is not a defined option. Ignoring!" % (o)
 
 def reloadConfig(file=None, options=None):
        if file: