diff --git a/contrib/linearize/linearize-data.py b/contrib/linearize/linearize-data.py --- a/contrib/linearize/linearize-data.py +++ b/contrib/linearize/linearize-data.py @@ -174,7 +174,7 @@ self.outFname = self.settings['output_file'] else: self.outFname = os.path.join( - self.settings['output'], "blk%05d.dat" % self.outFn) + self.settings['output'], "blk{:05d}.dat".format(self.outFn)) print("Output file " + self.outFname) self.outF = open(self.outFname, "wb") @@ -188,11 +188,11 @@ self.highTS = blkTS if (self.blkCountOut % 1000) == 0: - print('%i blocks scanned, %i blocks written (of %i, %.1f%% complete)' % - (self.blkCountIn, self.blkCountOut, len(self.blkindex), 100.0 * self.blkCountOut / len(self.blkindex))) + print('{} blocks scanned, {} blocks written (of {}, {:.1f}% complete)'.format( + self.blkCountIn, self.blkCountOut, len(self.blkindex), 100.0 * self.blkCountOut / len(self.blkindex))) def inFileName(self, fn): - return os.path.join(self.settings['input'], "blk%05d.dat" % fn) + return os.path.join(self.settings['input'], "blk{:05d}.dat".format(fn)) def fetchBlock(self, extent): '''Fetch block contents from disk given extents''' @@ -273,7 +273,7 @@ else: # If no space in cache, seek forward self.inF.seek(inLen, os.SEEK_CUR) - print("Done (%i blocks written)" % (self.blkCountOut)) + print("Done ({} blocks written)".format((self.blkCountOut))) if __name__ == '__main__': diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -32,7 +32,7 @@ class BitcoinRPC: def __init__(self, host, port, username, password): - authpair = "%s:%s" % (username, password) + authpair = "{}:{}".format(username, password) authpair = authpair.encode('utf-8') self.authhdr = b"Basic " + base64.b64encode(authpair) self.conn = httplib.HTTPConnection(host, port=port, timeout=30)