convert tabs to spaces in source code thanks to reindent.py

Additional fixes thanks to sed, 2to3 -f ws_comma, and manual editing.

data/emoticons/animated/emoticons.py

 # coding=utf-8
 emoticons = {
-	'smile.png': [':-)', ':)'],
-	'coolglasses.png': ['B-)', '(H)'],
-	'wink.gif': [';-)', ';)'],
-	'biggrin.png': [':-D', ':D'],
-	'unhappy.png': [':-(', ':('],
-	'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("],
-	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-	'blush.png': [':-$', ':$'],
-	'angry.png': [':-@', ':@'],
-	'bat.gif': [':-[', ':['],
-	'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-	'stare.png': [':-|', ':|'],
-	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	'oh.png': ['=-O', ':-O', ':O'],
-	'heart.png': ['<3', '(L)', '*IN LOVE*'],
-	'pussy.png': ['(@)'],
-	'cuffs.png': ['(%)'],
-	'moon.png': ['(S)'],
-	'lamp.png': ['(I)'],
-	'music.png': ['(8)'],
-	'beer.png': ['(B)', '*DRINK*'],
-	'brflower.png': ['(W)'],
-	'boy.png': ['(Z)'],
-	'girl.png': ['(X)'],
-	'mail.png': ['(E)'],
-	'thumbdown.png': ['(N)'],
-	'photo.png': ['(P)'],
-	'thumbup.png': ['(Y)', '*THUMBS UP*'],
-	'hugleft.png': ['(})'],
-	'brheart.png': ['</3', '(U)'],
-	'flower.png': ['@}->--', '(F)'],
-	'drink.png': ['(D)'],
-	'phone.png': ['(T)'],
-	'coffee.png': ['(C)'],
-	'hugright.png': ['({)'],
-	'star.png': ['(*)'],
-	'rainbow.png': ['(R)'],
-	'cigarette.gif': ['(ci)'],
-	'cake.gif': ['(^)'],
-	'dontknow.gif': [':^)'],
-	'eyeroll.gif': ['8-)'],
-	'lightning.gif': ['(li)'],
-	'party.gif': ['<:o)'],
-	'sleepy.gif': ['|-)'],
-	'think.gif': ['*-)'],
-	'puke.gif': [':-!'],
+        'smile.png': [':-)', ':)'],
+        'coolglasses.png': ['B-)', '(H)'],
+        'wink.gif': [';-)', ';)'],
+        'biggrin.png': [':-D', ':D'],
+        'unhappy.png': [':-(', ':('],
+        'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("],
+        'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
+        'blush.png': [':-$', ':$'],
+        'angry.png': [':-@', ':@'],
+        'bat.gif': [':-[', ':['],
+        'kiss.png': [':-{}', ':-*', ':*', '(K)'],
+        'stare.png': [':-|', ':|'],
+        'devil.png': [']:->', '>:-)', '>:)', '(6)'],
+        'tongue.png': [':-P', ':P', ':-þ', ':þ'],
+        'oh.png': ['=-O', ':-O', ':O'],
+        'heart.png': ['<3', '(L)', '*IN LOVE*'],
+        'pussy.png': ['(@)'],
+        'cuffs.png': ['(%)'],
+        'moon.png': ['(S)'],
+        'lamp.png': ['(I)'],
+        'music.png': ['(8)'],
+        'beer.png': ['(B)', '*DRINK*'],
+        'brflower.png': ['(W)'],
+        'boy.png': ['(Z)'],
+        'girl.png': ['(X)'],
+        'mail.png': ['(E)'],
+        'thumbdown.png': ['(N)'],
+        'photo.png': ['(P)'],
+        'thumbup.png': ['(Y)', '*THUMBS UP*'],
+        'hugleft.png': ['(})'],
+        'brheart.png': ['</3', '(U)'],
+        'flower.png': ['@}->--', '(F)'],
+        'drink.png': ['(D)'],
+        'phone.png': ['(T)'],
+        'coffee.png': ['(C)'],
+        'hugright.png': ['({)'],
+        'star.png': ['(*)'],
+        'rainbow.png': ['(R)'],
+        'cigarette.gif': ['(ci)'],
+        'cake.gif': ['(^)'],
+        'dontknow.gif': [':^)'],
+        'eyeroll.gif': ['8-)'],
+        'lightning.gif': ['(li)'],
+        'party.gif': ['<:o)'],
+        'sleepy.gif': ['|-)'],
+        'think.gif': ['*-)'],
+        'puke.gif': [':-!'],
 }
-
-# vim: se ts=3:

data/emoticons/static-big/emoticons.py

 # coding=utf-8
 emoticons = {
-	'smile.png': [':-)', ':)'],
-	'coolglasses.png': ['8-)', 'B-)', '(H)'],
-	'wink.png': [';-)', ';)'],
-	'biggrin.png': [':-D', ':D'],
-	'unhappy.png': [':-(', ':('],
-	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
-	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-	'blush.png': [':-$', ':$'],
-	'angry.png': [':-@', ':@'],
-	'bat.png': [':-[', ':['],
-	'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-	'stare.png': [':-|', ':|'],
-	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	'oh.png': ['=-O', ':-O', ':O'],
-	'heart.png': ['<3', '(L)', '*IN LOVE*'],
-	'lion.png': [':3', '>:3'],
-	'pussy.png': ['(@)', '=^.^='],
-	'cuffs.png': ['(%)'],
-	'moon.png': ['(S)'],
-	'lamp.png': ['(I)'],
-	'music.png': ['(8)'],
-	'beer.png': ['(B)', '*DRINK*'],
-	'brflower.png': ['(W)'],
-	'boy.png': ['(Z)'],
-	'girl.png': ['(X)'],
-	'mail.png': ['(E)'],
-	'thumbdown.png': ['(N)'],
-	'photo.png': ['(P)'],
-	'thumbup.png': ['(Y)', '*THUMBS UP*'],
-	'hugleft.png': ['(})'],
-	'brheart.png': ['</3', '(U)'],
-	'flower.png': ['@}->--', '(F)'],
-	'drink.png': ['(D)'],
-	'phone.png': ['(T)'],
-	'coffee.png': ['(C)'],
-	'hugright.png': ['({)'],
-	'star.png': ['(*)'],
-	'rainbow.png': ['(R)'],
-	'puke.png': [':-!'],
+        'smile.png': [':-)', ':)'],
+        'coolglasses.png': ['8-)', 'B-)', '(H)'],
+        'wink.png': [';-)', ';)'],
+        'biggrin.png': [':-D', ':D'],
+        'unhappy.png': [':-(', ':('],
+        'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
+        'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
+        'blush.png': [':-$', ':$'],
+        'angry.png': [':-@', ':@'],
+        'bat.png': [':-[', ':['],
+        'kiss.png': [':-{}', ':-*', ':*', '(K)'],
+        'stare.png': [':-|', ':|'],
+        'devil.png': [']:->', '>:-)', '>:)', '(6)'],
+        'tongue.png': [':-P', ':P', ':-þ', ':þ'],
+        'oh.png': ['=-O', ':-O', ':O'],
+        'heart.png': ['<3', '(L)', '*IN LOVE*'],
+        'lion.png': [':3', '>:3'],
+        'pussy.png': ['(@)', '=^.^='],
+        'cuffs.png': ['(%)'],
+        'moon.png': ['(S)'],
+        'lamp.png': ['(I)'],
+        'music.png': ['(8)'],
+        'beer.png': ['(B)', '*DRINK*'],
+        'brflower.png': ['(W)'],
+        'boy.png': ['(Z)'],
+        'girl.png': ['(X)'],
+        'mail.png': ['(E)'],
+        'thumbdown.png': ['(N)'],
+        'photo.png': ['(P)'],
+        'thumbup.png': ['(Y)', '*THUMBS UP*'],
+        'hugleft.png': ['(})'],
+        'brheart.png': ['</3', '(U)'],
+        'flower.png': ['@}->--', '(F)'],
+        'drink.png': ['(D)'],
+        'phone.png': ['(T)'],
+        'coffee.png': ['(C)'],
+        'hugright.png': ['({)'],
+        'star.png': ['(*)'],
+        'rainbow.png': ['(R)'],
+        'puke.png': [':-!'],
 }
-
-# vim: se ts=3:

data/emoticons/static/emoticons.py

 # coding=utf-8
 emoticons = {
-	'smile.png': [':-)', ':)'],
-	'coolglasses.png': ['8-)', 'B-)', '(H)'],
-	'wink.png': [';-)', ';)'],
-	'biggrin.png': [':-D', ':D'],
-	'unhappy.png': [':-(', ':('],
-	'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
-	'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
-	'blush.png': [':-$', ':$'],
-	'angry.png': [':-@', ':@'],
-	'bat.png': [':-[', ':['],
-	'kiss.png': [':-{}', ':-*', ':*', '(K)'],
-	'stare.png': [':-|', ':|'],
-	'devil.png': [']:->', '>:-)', '>:)', '(6)'],
-	'tongue.png': [':-P', ':P', ':-þ', ':þ'],
-	'oh.png': ['=-O', ':-O', ':O'],
-	'heart.png': ['<3', '(L)', '*IN LOVE*'],
-	'lion.png': [':3', '>:3'],
-	'pussy.png': ['(@)', '=^.^='],
-	'cuffs.png': ['(%)'],
-	'moon.png': ['(S)'],
-	'lamp.png': ['(I)'],
-	'music.png': ['(8)'],
-	'beer.png': ['(B)', '*DRINK*'],
-	'brflower.png': ['(W)'],
-	'boy.png': ['(Z)'],
-	'girl.png': ['(X)'],
-	'mail.png': ['(E)'],
-	'thumbdown.png': ['(N)'],
-	'photo.png': ['(P)'],
-	'thumbup.png': ['(Y)', '*THUMBS UP*'],
-	'hugleft.png': ['(})'],
-	'brheart.png': ['</3', '(U)'],
-	'flower.png': ['@}->--', '(F)'],
-	'drink.png': ['(D)'],
-	'phone.png': ['(T)'],
-	'coffee.png': ['(C)'],
-	'hugright.png': ['({)'],
-	'star.png': ['(*)'],
-	'rainbow.png': ['(R)'],
-	'puke.png': [':-!'],
+        'smile.png': [':-)', ':)'],
+        'coolglasses.png': ['8-)', 'B-)', '(H)'],
+        'wink.png': [';-)', ';)'],
+        'biggrin.png': [':-D', ':D'],
+        'unhappy.png': [':-(', ':('],
+        'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("],
+        'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'],
+        'blush.png': [':-$', ':$'],
+        'angry.png': [':-@', ':@'],
+        'bat.png': [':-[', ':['],
+        'kiss.png': [':-{}', ':-*', ':*', '(K)'],
+        'stare.png': [':-|', ':|'],
+        'devil.png': [']:->', '>:-)', '>:)', '(6)'],
+        'tongue.png': [':-P', ':P', ':-þ', ':þ'],
+        'oh.png': ['=-O', ':-O', ':O'],
+        'heart.png': ['<3', '(L)', '*IN LOVE*'],
+        'lion.png': [':3', '>:3'],
+        'pussy.png': ['(@)', '=^.^='],
+        'cuffs.png': ['(%)'],
+        'moon.png': ['(S)'],
+        'lamp.png': ['(I)'],
+        'music.png': ['(8)'],
+        'beer.png': ['(B)', '*DRINK*'],
+        'brflower.png': ['(W)'],
+        'boy.png': ['(Z)'],
+        'girl.png': ['(X)'],
+        'mail.png': ['(E)'],
+        'thumbdown.png': ['(N)'],
+        'photo.png': ['(P)'],
+        'thumbup.png': ['(Y)', '*THUMBS UP*'],
+        'hugleft.png': ['(})'],
+        'brheart.png': ['</3', '(U)'],
+        'flower.png': ['@}->--', '(F)'],
+        'drink.png': ['(D)'],
+        'phone.png': ['(T)'],
+        'coffee.png': ['(C)'],
+        'hugright.png': ['({)'],
+        'star.png': ['(*)'],
+        'rainbow.png': ['(R)'],
+        'puke.png': [':-!'],
 }
-
-# vim: se ts=3:

scripts/dev/run-pychecker.py

@@ -5,10 +5,7 @@ import os
 import sys
 
 if os.getcwd().endswith('dev'):
-	os.chdir('../../src/') # we were in scripts/dev
+    os.chdir('../../src/') # we were in scripts/dev
 
 os.system('pychecker --limit 10000 --no-shadowbuiltin *.py &> /tmp/pychecker-gajim.log')
 os.system('$EDITOR /tmp/pychecker-gajim.log')
-
-
-# vim: se ts=3:

setup_osx.py

@@ -70,135 +70,135 @@ exec ${TOPDIR}/MacOS/Python ${RESOURCEPATH}/gajim-remote.py $* \n\
 ###
 
 def check(ret):
-	if isinstance(ret, list):
-		if ret[0] != 0:
-			raise Exception("Command failed: " + ret[1])
-	elif isinstance(ret, int):
-		if ret != 0:
-			raise Exception("Command failed")
-	return
+    if isinstance(ret, list):
+        if ret[0] != 0:
+            raise Exception("Command failed: " + ret[1])
+    elif isinstance(ret, int):
+        if ret != 0:
+            raise Exception("Command failed")
+    return
 
 
 def force(func):
-	try:
-		func()
-	except Exception:
-		pass
-	return
+    try:
+        func()
+    except Exception:
+        pass
+    return
 
 
 def writeScript(filename, contents):
-	script = open(filename, "w+")
-	script.write(contents)
-	script.close()
-	system("chmod +x %s" % filename)
-	return
+    script = open(filename, "w+")
+    script.write(contents)
+    script.close()
+    system("chmod +x %s" % filename)
+    return
 
 
 def cleanup():
-	force(lambda:rmtree("build"))
-	force(lambda:rmtree("dist"))
+    force(lambda: rmtree("build"))
+    force(lambda: rmtree("dist"))
 
 def stageInstall():
-	check(system("make DATADIR=%s/build/inst LIBDIR=%s/build/inst prefix=%s/build/inst DOCDIR=%s/build/inst/share/doc install" % (PWD, PWD, PWD, PWD)))
-	force(lambda:unlink("src/osx/growl/_growl.so"))
-	force(lambda:unlink("src/osx/growl/_growlImage.so"))
-	force(lambda:unlink("src/osx/idle.so"))
-	force(lambda:unlink("src/osx/nsapp.so"))
-	force(lambda:unlink("src/osx/syncmenu.so"))
-	force(lambda:unlink("src/gtkspell.so"))
-	symlink("%s/build/inst/lib/gajim/_growl.so" % PWD, "src/osx/growl/_growl.so")
-	symlink("%s/build/inst/lib/gajim/_growlImage.so" % PWD,
-		 "src/osx/growl/_growlImage.so")
-	symlink("%s/build/inst/lib/gajim/idle.so" % PWD, "src/osx/idle.so")
-	symlink("%s/build/inst/lib/gajim/nsapp.so" % PWD, "src/osx/nsapp.so")
-	symlink("%s/build/inst/lib/gajim/syncmenu.so" % PWD, "src/osx/syncmenu.so")
-	if os.path.isfile("build/inst/lib/gajim/gtkspell.so"):
-		symlink("%s/build/inst/lib/gajim/gtkspell.so" % PWD, "src/gtkspell.so")
-	return
+    check(system("make DATADIR=%s/build/inst LIBDIR=%s/build/inst prefix=%s/build/inst DOCDIR=%s/build/inst/share/doc install" % (PWD, PWD, PWD, PWD)))
+    force(lambda: unlink("src/osx/growl/_growl.so"))
+    force(lambda: unlink("src/osx/growl/_growlImage.so"))
+    force(lambda: unlink("src/osx/idle.so"))
+    force(lambda: unlink("src/osx/nsapp.so"))
+    force(lambda: unlink("src/osx/syncmenu.so"))
+    force(lambda: unlink("src/gtkspell.so"))
+    symlink("%s/build/inst/lib/gajim/_growl.so" % PWD, "src/osx/growl/_growl.so")
+    symlink("%s/build/inst/lib/gajim/_growlImage.so" % PWD,
+             "src/osx/growl/_growlImage.so")
+    symlink("%s/build/inst/lib/gajim/idle.so" % PWD, "src/osx/idle.so")
+    symlink("%s/build/inst/lib/gajim/nsapp.so" % PWD, "src/osx/nsapp.so")
+    symlink("%s/build/inst/lib/gajim/syncmenu.so" % PWD, "src/osx/syncmenu.so")
+    if os.path.isfile("build/inst/lib/gajim/gtkspell.so"):
+        symlink("%s/build/inst/lib/gajim/gtkspell.so" % PWD, "src/gtkspell.so")
+    return
 
 
 def buildApp():
-	sys.path.append('src')
-	sys.path.append(GTK_DIR + "/lib/python2.5/site-packages")
-	sys.path.append(GTK_DIR + "/lib/python2.5/site-packages/gtk-2.0")
-	OPTIONS = {'argv_emulation':True,
-			   'excludes':'docutils,Crypto,dbus,OpenSSL,cairo,gtk,gobject,atk,pangocairo',
-			   'iconfile':'data/pixmaps/gajim.icns',
-			   'includes':'osx,ConfigParser,compiler,UserString,history_manager',
-			   'plist':{'LSMinimumSystemVersion':'10.4.0',
-						'NSHumanReadableCopyright':'GNU General Public License',
-						'CFBundleIdentifier':'org.gajim',
-						'NSMainNibFile':'Gajim',
-						},
-			   }
-	setup(
-		name = NAME, version = VERSION, description = DESCRIPTION,
-		author = AUTHOR, url = URL, download_url = DOWNLOAD_URL,
-		license = LICENSE,
-		app=['src/gajim.py'],
-		data_files=['data/nibs/Gajim.nib'],
-		options={'py2app': OPTIONS},
-		setup_requires=['py2app'],
-		)
-	return
+    sys.path.append('src')
+    sys.path.append(GTK_DIR + "/lib/python2.5/site-packages")
+    sys.path.append(GTK_DIR + "/lib/python2.5/site-packages/gtk-2.0")
+    OPTIONS = {'argv_emulation': True,
+               'excludes': 'docutils,Crypto,dbus,OpenSSL,cairo,gtk,gobject,atk,pangocairo',
+               'iconfile': 'data/pixmaps/gajim.icns',
+               'includes': 'osx,ConfigParser,compiler,UserString,history_manager',
+               'plist': {'LSMinimumSystemVersion': '10.4.0',
+                         'NSHumanReadableCopyright': 'GNU General Public License',
+                         'CFBundleIdentifier': 'org.gajim',
+                         'NSMainNibFile': 'Gajim',
+                        },
+              }
+    setup(
+        name=NAME, version=VERSION, description=DESCRIPTION,
+        author=AUTHOR, url=URL, download_url=DOWNLOAD_URL,
+        license=LICENSE,
+        app=['src/gajim.py'],
+        data_files=['data/nibs/Gajim.nib'],
+        options={'py2app': OPTIONS},
+        setup_requires=['py2app'],
+        )
+    return
 
 
 def setupPrep():
-	copy("src/osx/prep_py2app.py", APP_RS)
-	move("dist/Gajim.app/Contents/Resources/__boot__.py",
-		 "dist/Gajim.app/Contents/Resources/__boot__.py.org")
-	new = open("dist/Gajim.app/Contents/Resources/__boot__.py", "w+")
-	org = open("dist/Gajim.app/Contents/Resources/__boot__.py.org")
-	for line in org:
-		new.write(line)
-		if (('site.addsitedir' in line) and ('Python' in line)):
-			new.write("    import prep_py2app\n")
-	new.close()
-	org.close()
-	unlink("dist/Gajim.app/Contents/Resources/__boot__.py.org")
-	return
+    copy("src/osx/prep_py2app.py", APP_RS)
+    move("dist/Gajim.app/Contents/Resources/__boot__.py",
+             "dist/Gajim.app/Contents/Resources/__boot__.py.org")
+    new = open("dist/Gajim.app/Contents/Resources/__boot__.py", "w+")
+    org = open("dist/Gajim.app/Contents/Resources/__boot__.py.org")
+    for line in org:
+        new.write(line)
+        if (('site.addsitedir' in line) and ('Python' in line)):
+            new.write("    import prep_py2app\n")
+    new.close()
+    org.close()
+    unlink("dist/Gajim.app/Contents/Resources/__boot__.py.org")
+    return
 
 
 def finishApp():
-	# setup gajim dirs
-	copytree("build/inst/share/gajim/data", APP_RS + "/data")
-	copy("data/pixmaps/gajim.icns", APP_RS + "/data/pixmaps")
-	copytree("build/inst/share/locale", APP_RS + "/locale")
-	copytree("build/inst/share/man", APP_RS + "/man")
-	force(lambda:unlink("dist/Gajim.app/Contents/data"))
-	symlink("Resources/data", "dist/Gajim.app/Contents/data")
-	copy("src/gajim-remote.py", "dist/Gajim.app/Contents/Resources")
-	# Nuke libs that are in the framework
-	move("dist/Gajim.app/Contents/Frameworks/Python.framework",
-		 "dist/Gajim.app/Contents/Python.framework")
-	rmtree("dist/Gajim.app/Contents/Frameworks")
-	mkdir("dist/Gajim.app/Contents/Frameworks")
-	move("dist/Gajim.app/Contents/Python.framework",
-		 "dist/Gajim.app/Contents/Frameworks/Python.framework")
-	# Adjust the running of the app
-	move("dist/Gajim.app/Contents/MacOS/Gajim",
-		 "dist/Gajim.app/Contents/MacOS/Gajim.bin")
-	writeScript("dist/Gajim.app/Contents/MacOS/Gajim", GAJIM_SCRIPT)
-	setupPrep()
-	# Setup the gajim-remote script
-	writeScript("dist/Gajim.app/Contents/MacOS/gajim-remote",
-				GAJIM_REMOTE_SCRIPT)
-	# Touch the top dir so Finder knows to update its idea of this bundle
-	utime("dist/Gajim.app", None)
-	return
+    # setup gajim dirs
+    copytree("build/inst/share/gajim/data", APP_RS + "/data")
+    copy("data/pixmaps/gajim.icns", APP_RS + "/data/pixmaps")
+    copytree("build/inst/share/locale", APP_RS + "/locale")
+    copytree("build/inst/share/man", APP_RS + "/man")
+    force(lambda: unlink("dist/Gajim.app/Contents/data"))
+    symlink("Resources/data", "dist/Gajim.app/Contents/data")
+    copy("src/gajim-remote.py", "dist/Gajim.app/Contents/Resources")
+    # Nuke libs that are in the framework
+    move("dist/Gajim.app/Contents/Frameworks/Python.framework",
+             "dist/Gajim.app/Contents/Python.framework")
+    rmtree("dist/Gajim.app/Contents/Frameworks")
+    mkdir("dist/Gajim.app/Contents/Frameworks")
+    move("dist/Gajim.app/Contents/Python.framework",
+             "dist/Gajim.app/Contents/Frameworks/Python.framework")
+    # Adjust the running of the app
+    move("dist/Gajim.app/Contents/MacOS/Gajim",
+             "dist/Gajim.app/Contents/MacOS/Gajim.bin")
+    writeScript("dist/Gajim.app/Contents/MacOS/Gajim", GAJIM_SCRIPT)
+    setupPrep()
+    # Setup the gajim-remote script
+    writeScript("dist/Gajim.app/Contents/MacOS/gajim-remote",
+                GAJIM_REMOTE_SCRIPT)
+    # Touch the top dir so Finder knows to update its idea of this bundle
+    utime("dist/Gajim.app", None)
+    return
 
 
 def distApp():
-	force(lambda:rmtree("dist/Gajim"))
-	force(lambda:rmtree("dist/Gajim.tar.bz2"))
-	mkdir("dist/Gajim")
-	check(system("tar -cf - -C dist Gajim.app | tar -xf - -C dist/Gajim"))
-	copy("README.osx", "dist/Gajim/README")
-	copy("TODO.osx", "dist/Gajim/TODO")
-	check(system("tar -C dist -jcf dist/Gajim-OSX-`date | awk '{printf(\"%s-%s-%s\", $6, $2, $3);}'`.tar.bz2 Gajim"))
-	rmtree("dist/Gajim")
-	return
+    force(lambda: rmtree("dist/Gajim"))
+    force(lambda: rmtree("dist/Gajim.tar.bz2"))
+    mkdir("dist/Gajim")
+    check(system("tar -cf - -C dist Gajim.app | tar -xf - -C dist/Gajim"))
+    copy("README.osx", "dist/Gajim/README")
+    copy("TODO.osx", "dist/Gajim/TODO")
+    check(system("tar -C dist -jcf dist/Gajim-OSX-`date | awk '{printf(\"%s-%s-%s\", $6, $2, $3);}'`.tar.bz2 Gajim"))
+    rmtree("dist/Gajim")
+    return
 
 
 
@@ -206,18 +206,16 @@ def distApp():
 ### Start
 ###
 if ((len(sys.argv) != 2) or ((sys.argv[1] != "build") and
-	(sys.argv[1] != "dist"))):
-	print "usage: python setup_osx.py [build]"
-	print "   or: python setup_osx.py [dist]"
-	sys.exit(1)
+        (sys.argv[1] != "dist"))):
+    print "usage: python setup_osx.py [build]"
+    print "   or: python setup_osx.py [dist]"
+    sys.exit(1)
 elif sys.argv[1] == "build":
-	sys.argv[1] = "py2app"
-	sys.argv.append('--use-pythonpath')
-	cleanup()
-	stageInstall()
-	buildApp()
-	finishApp()
+    sys.argv[1] = "py2app"
+    sys.argv.append('--use-pythonpath')
+    cleanup()
+    stageInstall()
+    buildApp()
+    finishApp()
 elif sys.argv[1] == "dist":
-	distApp()
-
-# vim: se ts=3:
+    distApp()

setup_win32.py

@@ -52,15 +52,16 @@ if 'gtk' in os.listdir('.'):
 opts = {
     'py2exe': {
         # ConfigParser,UserString,roman are needed for docutils
-        'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString',
+        'includes': ('pango,atk,gobject,cairo,pangocairo,gtk.keysyms,'
+                     'encodings,encodings.*,ConfigParser,UserString'),
         'dll_excludes': [
-            'iconv.dll','intl.dll','libatk-1.0-0.dll',
-            'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll',
-            'libglib-2.0-0.dll','libgmodule-2.0-0.dll',
-            'libgobject-2.0-0.dll','libgthread-2.0-0.dll',
-            'libgtk-win32-2.0-0.dll','libpango-1.0-0.dll',
-            'libpangowin32-1.0-0.dll','libcairo-2.dll',
-            'libpangocairo-1.0-0.dll','libpangoft2-1.0-0.dll',
+            'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',
+            'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll',
+            'libglib-2.0-0.dll', 'libgmodule-2.0-0.dll',
+            'libgobject-2.0-0.dll', 'libgthread-2.0-0.dll',
+            'libgtk-win32-2.0-0.dll', 'libpango-1.0-0.dll',
+            'libpangowin32-1.0-0.dll', 'libcairo-2.dll',
+            'libpangocairo-1.0-0.dll', 'libpangoft2-1.0-0.dll',
         ],
         'excludes': [
             'docutils'
@@ -70,22 +71,17 @@ opts = {