Mercurial > hg > gitweb
changeset 2600:c4325f0a9b91
clean up trailing white space.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Wed, 12 Jul 2006 08:28:00 -0700 |
| parents | e4b5e48052c6 |
| children | 00fc88b0b256 |
| files | mercurial/bdiff.c mercurial/commands.py mercurial/hg.py mercurial/hgweb/server.py mercurial/keepalive.py mercurial/packagescan.py mercurial/revlog.py |
| diffstat | 7 files changed, 32 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bdiff.c Wed Jul 12 09:01:10 2006 +0200 +++ b/mercurial/bdiff.c Wed Jul 12 08:28:00 2006 -0700 @@ -19,7 +19,7 @@ #ifdef __SUNPRO_C # define inline -#endif +#endif #ifdef _WIN32 #ifdef _MSC_VER
--- a/mercurial/commands.py Wed Jul 12 09:01:10 2006 +0200 +++ b/mercurial/commands.py Wed Jul 12 08:28:00 2006 -0700 @@ -548,7 +548,7 @@ """show help for a command, extension, or list of commands With no arguments, print a list of commands and short help. - + Given a command name, print help for that command. Given an extension name, print help for that extension, and the @@ -579,7 +579,7 @@ # options if i[1]: option_lists.append(("options", i[1])) - + def helplist(select=None): h = {} cmds = {} @@ -3300,7 +3300,7 @@ if k.endswith('.' + name) or v == name: return sys.modules[v] raise KeyError(name) - + def dispatch(args): for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM': num = getattr(signal, name, None)
--- a/mercurial/hg.py Wed Jul 12 09:01:10 2006 +0200 +++ b/mercurial/hg.py Wed Jul 12 08:28:00 2006 -0700 @@ -88,7 +88,7 @@ If an exception is raised, the partly cloned/updated destination repository will be deleted. - + Keyword arguments: dest: URL of destination repository to create (defaults to base
--- a/mercurial/hgweb/server.py Wed Jul 12 09:01:10 2006 +0200 +++ b/mercurial/hgweb/server.py Wed Jul 12 08:28:00 2006 -0700 @@ -129,7 +129,7 @@ self.length = int(h[1]) # The value of the Connection header is a list of case-insensitive # tokens separated by commas and optional whitespace. - if 'close' in [token.strip().lower() for token in + if 'close' in [token.strip().lower() for token in self.headers.get('connection', '').split(',')]: should_close = True if should_close:
--- a/mercurial/keepalive.py Wed Jul 12 09:01:10 2006 +0200 +++ b/mercurial/keepalive.py Wed Jul 12 08:28:00 2006 -0700 @@ -9,9 +9,9 @@ # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., -# 59 Temple Place, Suite 330, +# License along with this library; if not, write to the +# Free Software Foundation, Inc., +# 59 Temple Place, Suite 330, # Boston, MA 02111-1307 USA # This file is part of urlgrabber, a high-level cross-protocol url-grabber @@ -24,7 +24,7 @@ >>> keepalive_handler = HTTPHandler() >>> opener = urllib2.build_opener(keepalive_handler) >>> urllib2.install_opener(opener) ->>> +>>> >>> fo = urllib2.urlopen('http://www.python.org') If a connection to a given host is requested, and all of the existing @@ -111,7 +111,7 @@ import sys if sys.version_info < (2, 4): HANDLE_ERRORS = 1 else: HANDLE_ERRORS = 0 - + class ConnectionManager: """ The connection manager must be able to: @@ -151,7 +151,7 @@ def set_ready(self, connection, ready): try: self._readymap[connection] = ready except KeyError: pass - + def get_ready_conn(self, host): conn = None self._lock.acquire() @@ -175,7 +175,7 @@ class HTTPHandler(urllib2.HTTPHandler): def __init__(self): self._cm = ConnectionManager() - + #### Connection Management def open_connections(self): """return a list of connected hosts and the number of connections @@ -189,14 +189,14 @@ for h in self._cm.get_all(host): self._cm.remove(h) h.close() - + def close_all(self): """close all open connections""" for host, conns in self._cm.get_all().items(): for h in conns: self._cm.remove(h) h.close() - + def _request_closed(self, request, host, connection): """tells us that this request is now closed and the the connection is ready for another request""" @@ -205,7 +205,7 @@ def _remove_connection(self, host, connection, close=0): if close: connection.close() self._cm.remove(connection) - + #### Transaction Execution def http_open(self, req): return self.do_open(HTTPConnection, req) @@ -239,7 +239,7 @@ r = h.getresponse() except (socket.error, httplib.HTTPException), err: raise urllib2.URLError(err) - + # if not a persistent connection, don't try to reuse it if r.will_close: self._cm.remove(h) @@ -251,7 +251,7 @@ r.code = r.status r.headers = r.msg r.msg = r.reason - + if r.status == 200 or not HANDLE_ERRORS: return r else: @@ -287,7 +287,7 @@ self._cm.remove(h) h.close() raise - + if r is None or r.version == 9: # httplib falls back to assuming HTTP 0.9 if it gets a # bad header back. This is most likely to happen if @@ -342,7 +342,7 @@ # although read() never adds to the buffer. # Both readline and readlines have been stolen with almost no # modification from socket.py - + def __init__(self, sock, debuglevel=0, strict=0, method=None): if method: # the httplib in python 2.3 uses the method arg @@ -371,7 +371,7 @@ def close_connection(self): self._handler._remove_connection(self._host, self._connection, close=1) self.close() - + def info(self): return self.headers @@ -425,7 +425,7 @@ class HTTPConnection(httplib.HTTPConnection): # use the modified response class response_class = HTTPResponse - + ######################################################################### ##### TEST FUNCTIONS ######################################################################### @@ -459,7 +459,7 @@ def continuity(url): import md5 format = '%25s: %s' - + # first fetch the file with the normal http handler opener = urllib2.build_opener() urllib2.install_opener(opener) @@ -506,7 +506,7 @@ t2 = fetch(N, url) print ' TIME: %.3f s' % t2 print ' improvement factor: %.2f' % (t1/t2, ) - + def fetch(N, url, delay=0): import time lens = [] @@ -538,7 +538,7 @@ fo = urllib2.urlopen(url) data1 = fo.read() fo.close() - + i = 20 print " waiting %i seconds for the server to close the connection" % i while i > 0: @@ -560,7 +560,7 @@ DEBUG = dbbackup - + def test(url, N=10): print "checking error hander (do this on a non-200)" try: error_handler(url) @@ -576,7 +576,7 @@ print print "performing dropped-connection check" test_timeout(url) - + if __name__ == '__main__': import time import sys
--- a/mercurial/packagescan.py Wed Jul 12 09:01:10 2006 +0200 +++ b/mercurial/packagescan.py Wed Jul 12 08:28:00 2006 -0700 @@ -17,12 +17,12 @@ sys.modules['mercurial.demandload'] = sys.modules[__name__] # Requiredmodules contains the modules imported by demandload. -# Please note that demandload can be invoked before the +# Please note that demandload can be invoked before the # mercurial.packagescan.scan method is invoked in case a mercurial # module is imported. -requiredmodules = {} +requiredmodules = {} def demandload(scope, modules): - """ fake demandload function that collects the required modules + """ fake demandload function that collects the required modules foo import foo foo bar import foo, bar foo.bar import foo.bar @@ -49,7 +49,7 @@ scope[mn] = mod requiredmodules[mod.__name__] = 1 if len(comp) == i: break - mod = getattr(mod,comp[i]) + mod = getattr(mod,comp[i]) mn = string.join(comp[:i+1],'.') i += 1 else: