changeset: 77572:ec95b94ea831
parent: 77570:336c53c1f547
user: Alexander Belopolsky <alexander.belopolsky@gmail.com>
date: Fri Jun 22 12:46:19 2012 -0400
files: Tools/scripts/diff.py
description:
Issue #7582: Use ISO timestamp in diff.py
diff -r 336c53c1f547 -r ec95b94ea831 Tools/scripts/diff.py
--- a/Tools/scripts/diff.py	Fri Jun 22 12:25:57 2012 -0400
+++ b/Tools/scripts/diff.py	Fri Jun 22 12:46:19 2012 -0400
@@ -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)
+ return t.astimezone().isoformat()
 
 def main():
 
@@ -30,10 +36,12 @@
 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()
+ with open(tofile, 'U') as tf:
+ tolines = tf.readlines()
 
 if options.u:
 diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/ec95b94ea831">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/ec95b94ea831" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>