X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ljdump.py;fp=ljdump.py;h=d1e92874f7815e076548f24a8e93926bc9542f55;hb=a9e88c43e772b4781bed71acf046c5c2019dc1a4;hp=0ab61ec5c79ba6a480479afbca76a245b66a3e24;hpb=048d3c6a6100b94f0d8b3300a07737dfb066cda6;p=oss%2Fljdump.git diff --git a/ljdump.py b/ljdump.py index 0ab61ec..d1e9287 100755 --- a/ljdump.py +++ b/ljdump.py @@ -284,12 +284,13 @@ for p in userpics: print >>f, """""" % (p, userpics[p]) pic = urllib2.urlopen(userpics[p]) ext = MimeExtensions.get(pic.info()["Content-Type"], "") + picfn = re.sub(r"[\/]", "_", p) try: - picfn = codecs.utf_8_decode(p)[0] + picfn = codecs.utf_8_decode(picfn)[0] picf = open("%s/%s%s" % (Username, picfn, ext), "wb") except: # for installations where the above utf_8_decode doesn't work - picfn = "".join([ord(x) < 128 and x or "?" for x in p]) + picfn = "".join([ord(x) < 128 and x or "?" for x in picfn]) picf = open("%s/%s%s" % (Username, picfn, ext), "wb") shutil.copyfileobj(pic, picf) pic.close()