cpython: ec95b94ea831 (original) (raw)

Mercurial > cpython

changeset 77572:ec95b94ea831

Issue #7582: Use ISO timestamp in diff.py [#7582]

Alexander Belopolsky alexander.belopolsky@gmail.com
date	Fri, 22 Jun 2012 12:46:19 -0400
parents	336c53c1f547
children	4bb933184df4
files	Tools/scripts/diff.py
diffstat	1 files changed, 12 insertions(+), 4 deletions(-)[+] [-] Tools/scripts/diff.py 16

line wrap: on

line diff

--- a/Tools/scripts/diff.py +++ b/Tools/scripts/diff.py @@ -9,6 +9,12 @@ """ import sys, os, time, difflib, optparse +from datetime import datetime, timezone + +def file_mtime(path):

t = datetime.fromtimestamp(os.stat(path).st_mtime,

                          timezone.utc)[](#l1.11)

return t.astimezone().isoformat()

def main(): @@ -30,10 +36,12 @@ def main(): n = options.lines fromfile, tofile = args

fromdate = time.ctime(os.stat(fromfile).st_mtime)
todate = time.ctime(os.stat(tofile).st_mtime)
fromlines = open(fromfile, 'U').readlines()
tolines = open(tofile, 'U').readlines()

fromdate = file_mtime(fromfile)
todate = file_mtime(tofile)
with open(fromfile, 'U') as ff:
```
   fromlines = ff.readlines()[](#l1.27)
```
with open(tofile, 'U') as tf:
```
   tolines = tf.readlines()[](#l1.29)
```

if options.u: diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)