From dd6062319a82f7faeafc01587ce5f3953defa47b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Thu, 8 Apr 2010 01:10:17 +0200 Subject: [PATCH] More whitespace mini fixes. --- scripts/dev/run-pylint.py | 1 - setup_win32.py | 4 +-- src/common/dataforms.py | 1 - src/common/dh.py | 41 ++++++++++++------------- src/common/multimedia_helpers.py | 1 - src/common/xmpp/auth_nb.py | 2 +- src/common/xmpp/c14n.py | 1 - src/common/xmpp/idlequeue.py | 1 - src/common/zeroconf/zeroconf_bonjour.py | 1 - src/dialogs.py | 1 - src/ipython_view.py | 1 - test/lib/mock.py | 3 -- 12 files changed, 23 insertions(+), 35 deletions(-) diff --git a/scripts/dev/run-pylint.py b/scripts/dev/run-pylint.py index 7506d00bf..e2d54b14c 100755 --- a/scripts/dev/run-pylint.py +++ b/scripts/dev/run-pylint.py @@ -8,4 +8,3 @@ if os.getcwd().endswith('dev'): os.chdir('../../src/') # we were in scripts/dev os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142,W0613,R0201 --disable-checker=design " + "".join(sys.argv[1:])) - diff --git a/setup_win32.py b/setup_win32.py index 3ca8c8059..4f742bade 100644 --- a/setup_win32.py +++ b/setup_win32.py @@ -52,7 +52,8 @@ 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', @@ -78,7 +79,6 @@ setup( url='http://www.gajim.org/', download_url='http://www.gajim.org/downloads.php', license='GPL', - windows=[{'script': 'src/gajim.py', 'icon_resources': [(1, 'data/pixmaps/gajim.ico')]}, {'script': 'src/history_manager.py', diff --git a/src/common/dataforms.py b/src/common/dataforms.py index 1d656abbf..f6abce89f 100644 --- a/src/common/dataforms.py +++ b/src/common/dataforms.py @@ -615,4 +615,3 @@ class MultipleDataForm(DataForm): # record.setName('reported') # self.addChild(node=record) # return locals() - diff --git a/src/common/dh.py b/src/common/dh.py index 7f68fd851..827d87806 100644 --- a/src/common/dh.py +++ b/src/common/dh.py @@ -28,28 +28,27 @@ These constants have been obtained from RFC2409 and RFC3526. import string -generators = [ None, # one to get the right offset - 2, - 2, - None, - None, - 2, - None, - None, - None, - None, - None, - None, - None, - None, - 2, # group 14 - 2, - 2, - 2, - 2, - ] +generators = [None, # one to get the right offset + 2, + 2, + None, + None, + 2, + None, + None, + None, + None, + None, + None, + None, + None, + 2, # group 14 + 2, + 2, + 2, + 2] -hex_primes = [ None, +hex_primes = [None, # group 1 '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1 diff --git a/src/common/multimedia_helpers.py b/src/common/multimedia_helpers.py index 06ec7b5ca..6481e1be3 100644 --- a/src/common/multimedia_helpers.py +++ b/src/common/multimedia_helpers.py @@ -97,4 +97,3 @@ class VideoOutputManager(DeviceManager): # ximagesink self.detect_element('ximagesink', _('X Window System (without Xv)')) self.detect_element('autovideosink', _('Autodetect')) - diff --git a/src/common/xmpp/auth_nb.py b/src/common/xmpp/auth_nb.py index e952abbd6..6a59365ac 100644 --- a/src/common/xmpp/auth_nb.py +++ b/src/common/xmpp/auth_nb.py @@ -438,7 +438,7 @@ class SASL(PlugIn): self.scram_soup = 'n=' + self.username + ',r=' + nonce self.scram_gs2 = 'n,,' # No CB yet. sasl_data = (self.scram_gs2 + self.scram_soup).encode('base64').\ - replace('\n','') + replace('\n', '') node = Node('auth', attrs={'xmlns': NS_SASL, 'mechanism': self.mechanism}, payload=[sasl_data]) elif self.mechanism == 'DIGEST-MD5': diff --git a/src/common/xmpp/c14n.py b/src/common/xmpp/c14n.py index 1711c9899..0d318a352 100644 --- a/src/common/xmpp/c14n.py +++ b/src/common/xmpp/c14n.py @@ -57,4 +57,3 @@ def normalise_attr(val): def normalise_text(val): return val.replace('&', '&').replace('<', '<').replace('>', '>').replace('\r', ' ') - diff --git a/src/common/xmpp/idlequeue.py b/src/common/xmpp/idlequeue.py index e5c4ff8b1..1b0bccb04 100644 --- a/src/common/xmpp/idlequeue.py +++ b/src/common/xmpp/idlequeue.py @@ -543,4 +543,3 @@ class GlibIdleQueue(IdleQueue): def process(self): self._check_time_events() - diff --git a/src/common/zeroconf/zeroconf_bonjour.py b/src/common/zeroconf/zeroconf_bonjour.py index f19623236..1e57c0176 100644 --- a/src/common/zeroconf/zeroconf_bonjour.py +++ b/src/common/zeroconf/zeroconf_bonjour.py @@ -330,4 +330,3 @@ class Zeroconf: except pybonjour.BonjourError: return False return True - diff --git a/src/dialogs.py b/src/dialogs.py index 3e41769ad..21ec20114 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -4956,4 +4956,3 @@ class VoIPCallReceivedDialog(object): session.reject_content(content) dialog.destroy() - diff --git a/src/ipython_view.py b/src/ipython_view.py index e6319ff0e..6b128da01 100644 --- a/src/ipython_view.py +++ b/src/ipython_view.py @@ -534,4 +534,3 @@ class IPythonView(ConsoleView, IterableIPShell): if rv: rv = rv.strip('\n') self.showReturned(rv) self.cout.truncate(0) - diff --git a/test/lib/mock.py b/test/lib/mock.py index 0dab5ef14..fdaf000db 100644 --- a/test/lib/mock.py +++ b/test/lib/mock.py @@ -461,6 +461,3 @@ def HASMETHOD(method): return testFn CALLABLE = callable - - -