diff options
author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-16 09:18:34 (GMT) |
---|---|---|
committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-11-23 17:03:04 (GMT) |
commit | 4763fc39005ddb0fa3bb6e35edd8e888336da78f (patch) | |
tree | f1b963fd4bd5cd5a459506b3b652a36fe51407ea | |
parent | 2244a06586e2150f40a14d7742fcc32f947dac81 (diff) |
PEP8 cleanup: fix spaces around operators and parentheses
Reviewed-by: James Cameron <quozl@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
-rwxr-xr-x | maint-helper.py | 12 | ||||
-rw-r--r-- | src/sugar/dispatch/saferef.py | 50 | ||||
-rw-r--r-- | src/sugar/logger.py | 2 |
3 files changed, 30 insertions, 34 deletions
diff --git a/maint-helper.py b/maint-helper.py index 8496f06..b963e7f 100755 --- a/maint-helper.py +++ b/maint-helper.py @@ -22,7 +22,7 @@ import re import datetime import subprocess -source_exts = [ '.py', '.c', '.h', '.cpp' ] +source_exts = ['.py', '.c', '.h', '.cpp'] COPYRIGHT = 'Copyright (C) ' @@ -43,7 +43,7 @@ def get_name_and_version(): print 'Cannot find the package name and version.' sys.exit(0) - return [ match.group(2), match.group(1) ] + return [match.group(2), match.group(1)] def cmd_help(): @@ -54,7 +54,7 @@ maint-helper.py check-licenses - check licenses in the source' def cmd_build_snapshot(): - [ name, version ] = get_name_and_version() + [name, version] = get_name_and_version() print 'Update git...' @@ -88,7 +88,7 @@ def cmd_build_snapshot(): else: sugar_news = '' - [ name, version ] = get_name_and_version() + name, version = get_name_and_version() sugar_news += '%s - %s - %s\n\n' % (name, version, alphatag) f = open('NEWS', 'r') @@ -130,8 +130,8 @@ def cmd_build_snapshot(): def check_licenses(path, license, missing): - matchers = { 'LGPL' : 'GNU Lesser General Public', - 'GPL' : 'GNU General Public License' } + matchers = {'LGPL': 'GNU Lesser General Public License', + 'GPL': 'GNU General Public License'} license_file = os.path.join(path, '.license') if os.path.isfile(license_file): diff --git a/src/sugar/dispatch/saferef.py b/src/sugar/dispatch/saferef.py index 655f9a1..37443fb 100644 --- a/src/sugar/dispatch/saferef.py +++ b/src/sugar/dispatch/saferef.py @@ -8,7 +8,7 @@ aren't handled by the core weakref module). import weakref, traceback -def safeRef(target, onDelete = None): +def safeRef(target, onDelete=None): """Return a *safe* weak reference to a callable target target -- the object to be weakly referenced, if it's a @@ -33,7 +33,7 @@ def safeRef(target, onDelete = None): if callable(onDelete): return weakref.ref(target, onDelete) else: - return weakref.ref( target ) + return weakref.ref(target) class BoundMethodWeakref(object): @@ -72,7 +72,7 @@ class BoundMethodWeakref(object): _allInstances = weakref.WeakValueDictionary() - def __new__( cls, target, onDelete=None, *arguments,**named ): + def __new__(cls, target, onDelete=None, *arguments, **named): """Create new instance or return current instance Basically this method of construction allows us to @@ -85,14 +85,14 @@ class BoundMethodWeakref(object): of already-referenced methods. """ key = cls.calculateKey(target) - current =cls._allInstances.get(key) + current = cls._allInstances.get(key) if current is not None: - current.deletionMethods.append( onDelete) + current.deletionMethods.append(onDelete) return current else: - base = super( BoundMethodWeakref, cls).__new__( cls ) + base = super(BoundMethodWeakref, cls).__new__(cls) cls._allInstances[key] = base - base.__init__( target, onDelete, *arguments,**named) + base.__init__(target, onDelete, *arguments, **named) return base def __init__(self, target, onDelete=None): @@ -114,55 +114,51 @@ class BoundMethodWeakref(object): methods = self.deletionMethods[:] del self.deletionMethods[:] try: - del self.__class__._allInstances[ self.key ] + del self.__class__._allInstances[self.key] except KeyError: pass for function in methods: try: - if callable( function ): - function( self ) + if callable(function): + function(self) except Exception, e: try: traceback.print_exc() except AttributeError, err: - print '''Exception during saferef %s cleanup function %s: %s'''%( - self, function, e - ) + print ('Exception during saferef %s cleanup function' + ' %s: %s' % (self, function, e)) self.deletionMethods = [onDelete] - self.key = self.calculateKey( target ) + self.key = self.calculateKey(target) self.weakSelf = weakref.ref(target.im_self, remove) self.weakFunc = weakref.ref(target.im_func, remove) self.selfName = str(target.im_self) self.funcName = str(target.im_func.__name__) - def calculateKey( cls, target ): + def calculateKey(cls, target): """Calculate the reference key for this reference Currently this is a two-tuple of the id()'s of the target object and the target function respectively. """ - return (id(target.im_self),id(target.im_func)) - calculateKey = classmethod( calculateKey ) + return (id(target.im_self), id(target.im_func)) + calculateKey = classmethod(calculateKey) def __str__(self): """Give a friendly representation of the object""" - return """%s( %s.%s )"""%( - self.__class__.__name__, - self.selfName, - self.funcName, - ) + return '%s( %s.%s )' % (self.__class__.__name__, self.selfName, + self.funcName) __repr__ = __str__ - def __nonzero__( self ): + def __nonzero__(self): """Whether we are still a valid reference""" return self() is not None - def __cmp__( self, other ): + def __cmp__(self, other): """Compare with another reference""" - if not isinstance (other,self.__class__): - return cmp( self.__class__, type(other) ) - return cmp( self.key, other.key) + if not isinstance(other, self.__class__): + return cmp(self.__class__, type(other)) + return cmp(self.key, other.key) def __call__(self): """Return a strong reference to the bound method diff --git a/src/sugar/logger.py b/src/sugar/logger.py index 6a6b574..3837857 100644 --- a/src/sugar/logger.py +++ b/src/sugar/logger.py @@ -148,7 +148,7 @@ class TraceRepr(repr_.Repr): def repr1(self, x, level): for t in self._TYPES: if isinstance(x, t): - return getattr(self, 'repr_'+t.__name__)(x, level) + return getattr(self, 'repr_' + t.__name__)(x, level) return repr_.Repr.repr1(self, x, level) |