# 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
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()))
+ binval.addContent(base64.encodestring(self.getImageData()).replace("\n", ""))
return photo
def makeDataElement(self):
""" Returns an XML Element that can be put into a jabber:x:avatar IQ stanza. """
data = Element((None, "data"))
data["mimetype"] = "image/png"
- data.addContent(base64.encodestring(self.getImageData()))
+ data.addContent(base64.encodestring(self.getImageData()).replace("\n", ""))
return data
def __eq__(self, other):
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 """
return data
else:
LogEvent(INFO, "", "Avatar not found.")
- except IOError, e:
+ except IOError:
LogEvent(WARN, "", "IOError reading avatar.")
+ else:
+ return None