Mercurial > hg
changeset 27637:b502138f5faa
cleanup: remove superfluous space after space after equals (python)
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 31 Dec 2015 08:16:59 +0000 |
| parents | 21b363bd87dc |
| children | 90e3c5129226 |
| files | contrib/dirstatenonnormalcheck.py hgext/highlight/highlight.py hgext/zeroconf/Zeroconf.py mercurial/cmdutil.py mercurial/commands.py mercurial/context.py mercurial/extensions.py mercurial/hg.py mercurial/httppeer.py mercurial/revlog.py mercurial/revset.py mercurial/templater.py setup.py tests/run-tests.py tests/test-manifest.py tests/test-parseindex2.py tests/tinyproxy.py |
| diffstat | 17 files changed, 26 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/dirstatenonnormalcheck.py Mon Jan 04 21:54:46 2016 -0800 +++ b/contrib/dirstatenonnormalcheck.py Thu Dec 31 08:16:59 2015 +0000 @@ -33,7 +33,7 @@ def _checkdirstate(orig, self, arg): """Check nonnormal set consistency before and after the call to orig""" checkconsistency(self._ui, orig, self._map, self._nonnormalset, "before") - r = orig(self, arg) + r = orig(self, arg) checkconsistency(self._ui, orig, self._map, self._nonnormalset, "after") return r
--- a/hgext/highlight/highlight.py Mon Jan 04 21:54:46 2016 -0800 +++ b/hgext/highlight/highlight.py Thu Dec 31 08:16:59 2015 +0000 @@ -25,7 +25,7 @@ # append a <link ...> to the syntax highlighting css old_header = tmpl.load('header') if SYNTAX_CSS not in old_header: - new_header = old_header + SYNTAX_CSS + new_header = old_header + SYNTAX_CSS tmpl.cache['header'] = new_header text = fctx.data()
--- a/hgext/zeroconf/Zeroconf.py Mon Jan 04 21:54:46 2016 -0800 +++ b/hgext/zeroconf/Zeroconf.py Thu Dec 31 08:16:59 2015 +0000 @@ -150,7 +150,7 @@ _TYPE_TXT = 16 _TYPE_AAAA = 28 _TYPE_SRV = 33 -_TYPE_ANY = 255 +_TYPE_ANY = 255 # Mapping constants to names @@ -522,7 +522,7 @@ def readString(self, len): """Reads a string of a given length from the packet""" format = '!' + str(len) + 's' - length = struct.calcsize(format) + length = struct.calcsize(format) info = struct.unpack(format, self.data[self.offset:self.offset+length]) self.offset += length return info[0]
--- a/mercurial/cmdutil.py Mon Jan 04 21:54:46 2016 -0800 +++ b/mercurial/cmdutil.py Thu Dec 31 08:16:59 2015 +0000 @@ -117,7 +117,7 @@ diffopts.nodates = True diffopts.git = True diffopts.showfunc = True - originaldiff = patch.diff(repo, changes=status, opts=diffopts) + originaldiff = patch.diff(repo, changes=status, opts=diffopts) originalchunks = patch.parsepatch(originaldiff) # 1. filter patch, so we have intending-to apply subset of it @@ -2646,7 +2646,7 @@ extra=extra, editor=editor) - newdesc = changelog.stripdesc(new.description()) + newdesc = changelog.stripdesc(new.description()) if ((not node) and newdesc == old.description() and user == old.user() @@ -3200,9 +3200,9 @@ diffopts = patch.difffeatureopts(repo.ui, whitespace=True) diffopts.nodates = True diffopts.git = True - reversehunks = repo.ui.configbool('experimental', - 'revertalternateinteractivemode', - True) + reversehunks = repo.ui.configbool('experimental', + 'revertalternateinteractivemode', + True) if reversehunks: diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts) else:
--- a/mercurial/commands.py Mon Jan 04 21:54:46 2016 -0800 +++ b/mercurial/commands.py Thu Dec 31 08:16:59 2015 +0000 @@ -3117,7 +3117,7 @@ manifestonly = manifestfiles - dirstatefiles dsonly = dirstatefiles - manifestfiles dsnotadded = set(f for f in dsonly if dirstate[f] != 'a') - changedfiles = manifestonly | dsnotadded + changedfiles = manifestonly | dsnotadded dirstate.rebuild(ctx.node(), ctx.manifest(), changedfiles) finally: @@ -5493,7 +5493,7 @@ brev = checkout movemarkfrom = None if not checkout: - updata = destutil.destupdate(repo) + updata = destutil.destupdate(repo) checkout, movemarkfrom, brev = updata ret = hg.update(repo, checkout) except error.UpdateAbort as inst: @@ -6930,7 +6930,7 @@ if check: cmdutil.bailifchanged(repo, merge=False) if rev is None: - updata = destutil.destupdate(repo, clean=clean, check=check) + updata = destutil.destupdate(repo, clean=clean, check=check) rev, movemarkfrom, brev = updata repo.ui.setconfig('ui', 'forcemerge', tool, 'update')
--- a/mercurial/context.py Mon Jan 04 21:54:46 2016 -0800 +++ b/mercurial/context.py Thu Dec 31 08:16:59 2015 +0000 @@ -389,8 +389,8 @@ extra = {} if branch: extra['branch'] = encoding.fromlocal(branch) - ctx = memctx(repo, parents, text, files, getfilectx, user, - date, extra, editor) + ctx = memctx(repo, parents, text, files, getfilectx, user, + date, extra, editor) return ctx class changectx(basectx):
--- a/mercurial/extensions.py Mon Jan 04 21:54:46 2016 -0800 +++ b/mercurial/extensions.py Thu Dec 31 08:16:59 2015 +0000 @@ -45,7 +45,7 @@ '''return module with given extension name''' mod = None try: - mod = _extensions[name] + mod = _extensions[name] except KeyError: for k, v in _extensions.iteritems(): if k.endswith('.' + name) or k.endswith('/' + name):
--- a/mercurial/hg.py Mon Jan 04 21:54:46 2016 -0800 +++ b/mercurial/hg.py Thu Dec 31 08:16:59 2015 +0000 @@ -52,7 +52,7 @@ if not hashbranch and not branches: x = revs or None if util.safehasattr(revs, 'first'): - y = revs.first() + y = revs.first() elif revs: y = revs[0] else:
--- a/mercurial/httppeer.py Mon Jan 04 21:54:46 2016 -0800 +++ b/mercurial/httppeer.py Thu Dec 31 08:16:59 2015 +0000 @@ -254,7 +254,7 @@ os.unlink(filename) def _callcompressable(self, cmd, **args): - stream = self._callstream(cmd, **args) + stream = self._callstream(cmd, **args) return util.chunkbuffer(zgenerator(stream)) def _abort(self, exception):
--- a/mercurial/revlog.py Mon Jan 04 21:54:46 2016 -0800 +++ b/mercurial/revlog.py Thu Dec 31 08:16:59 2015 +0000 @@ -130,7 +130,7 @@ def parseindex(self, data, inline): s = self.size index = [] - nodemap = {nullid: nullrev} + nodemap = {nullid: nullrev} n = off = 0 l = len(data) while off + s <= l:
--- a/mercurial/revset.py Mon Jan 04 21:54:46 2016 -0800 +++ b/mercurial/revset.py Thu Dec 31 08:16:59 2015 +0000 @@ -2290,7 +2290,7 @@ elif op == 'not': # Optimize not public() to _notpublic() because we have a fast version if x[1] == ('func', ('symbol', 'public'), None): - newsym = ('func', ('symbol', '_notpublic'), None) + newsym = ('func', ('symbol', '_notpublic'), None) o = optimize(newsym, not small) return o[0], o[1] else:
--- a/mercurial/templater.py Mon Jan 04 21:54:46 2016 -0800 +++ b/mercurial/templater.py Thu Dec 31 08:16:59 2015 +0000 @@ -832,7 +832,7 @@ paths = templatepaths() if not paths: return _('no templates found, try `hg debuginstall` for more info') - dirlist = os.listdir(paths[0]) + dirlist = os.listdir(paths[0]) stylelist = [] for file in dirlist: split = file.split(".")
--- a/setup.py Mon Jan 04 21:54:46 2016 -0800 +++ b/setup.py Thu Dec 31 08:16:59 2015 +0000 @@ -210,7 +210,7 @@ kw = dict([[t.strip() for t in l.split(':', 1)] for l in open('.hg_archival.txt')]) if 'tag' in kw: - version = kw['tag'] + version = kw['tag'] elif 'latesttag' in kw: if 'changessincelatesttag' in kw: version = '%(latesttag)s+%(changessincelatesttag)s-%(node).12s' % kw @@ -500,7 +500,7 @@ rest = self.install_dir[len(common):] uplevel = len([n for n in os.path.split(rest) if n]) - libdir = uplevel * ('..' + os.sep) + self.install_lib[len(common):] + libdir = uplevel * ('..' + os.sep) + self.install_lib[len(common):] for outfile in self.outfiles: fp = open(outfile, 'rb')
--- a/tests/run-tests.py Mon Jan 04 21:54:46 2016 -0800 +++ b/tests/run-tests.py Thu Dec 31 08:16:59 2015 +0000 @@ -1272,7 +1272,7 @@ self.warned = [] self.times = [] - self._firststarttime = None + self._firststarttime = None # Data stored for the benefit of generating xunit reports. self.successes = [] self.faildata = {}
--- a/tests/test-manifest.py Mon Jan 04 21:54:46 2016 -0800 +++ b/tests/test-manifest.py Thu Dec 31 08:16:59 2015 +0000 @@ -187,7 +187,7 @@ def testCopy(self): m = self.parsemanifest(A_SHORT_MANIFEST) - m['a'] = BIN_HASH_1 + m['a'] = BIN_HASH_1 m2 = m.copy() del m del m2 # make sure we don't double free() anything
--- a/tests/test-parseindex2.py Mon Jan 04 21:54:46 2016 -0800 +++ b/tests/test-parseindex2.py Thu Dec 31 08:16:59 2015 +0000 @@ -22,7 +22,7 @@ s = 64 cache = None index = [] - nodemap = {nullid: nullrev} + nodemap = {nullid: nullrev} n = off = 0 l = len(data) - s
--- a/tests/tinyproxy.py Mon Jan 04 21:54:46 2016 -0800 +++ b/tests/tinyproxy.py Thu Dec 31 08:16:59 2015 +0000 @@ -29,7 +29,7 @@ rbufsize = 0 # self.rfile Be unbuffered def handle(self): - (ip, port) = self.client_address + (ip, port) = self.client_address allowed = getattr(self, 'allowed_clients', None) if allowed is not None and ip not in allowed: self.raw_requestline = self.rfile.readline()