[Rdiff-backup-commits] rdiff-backup ./CHANGELOG rdiff_backup/Time.py r...

[Ben Escoto]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Branch:         
Changes by:     Ben Escoto <address@hidden>     06/02/23 02:57:19

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : Time.py compare.py 
        testing        : timetest.py 

Log message:
        Times like "Mon Jun 5 11:00:23 1997" now recognized

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup/CHANGELOG.diff?tr1=1.181&tr2=1.182&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup/rdiff_backup/Time.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup/rdiff_backup/compare.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup/testing/timetest.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: rdiff-backup/CHANGELOG
diff -u rdiff-backup/CHANGELOG:1.181 rdiff-backup/CHANGELOG:1.182
--- rdiff-backup/CHANGELOG:1.181        Sun Jan 29 21:36:03 2006
+++ rdiff-backup/CHANGELOG      Thu Feb 23 02:57:19 2006
@@ -13,6 +13,9 @@
 Fix a security violation when restoring from a remote repository.
 (Patch from Charles Duffy.)
 
+Added times like "Mon Jun 5 11:00:23 1997" to the recognized time
+strings.  (Suggested by Wolfgang Dautermann.)
+
 
 New in v1.1.5 (2006/01/01)
 --------------------------
Index: rdiff-backup/rdiff_backup/Time.py
diff -u rdiff-backup/rdiff_backup/Time.py:1.12 
rdiff-backup/rdiff_backup/Time.py:1.13
--- rdiff-backup/rdiff_backup/Time.py:1.12      Fri Jan 20 16:24:24 2006
+++ rdiff-backup/rdiff_backup/Time.py   Thu Feb 23 02:57:19 2006
@@ -96,6 +96,11 @@
        """Return pretty version of time given w3 time string"""
        return timetopretty(stringtotime(timestring))
 
+def prettytotime(prettystring):
+       """Converts time like "Mon Jun 5 11:00:23" to epoch sec, or None"""
+       try: return time.mktime(time.strptime(prettystring))
+       except ValueError: return None
+
 def inttopretty(seconds):
        """Convert num of seconds to readable string like "2 hours"."""
        partlist = []
@@ -222,6 +227,10 @@
        if _session_regexp.search(timestr):
                return time_from_session(int(timestr[:-1]), rp)
 
+       # Try for long time, like "Mon Jun 5 11:00:23 1990"
+       t = prettytotime(timestr)
+       if t is not None: return t
+
        try: # test for an interval, like "2 days ago"
                return curtime - intstringtoseconds(timestr)
        except TimeException: pass
Index: rdiff-backup/rdiff_backup/compare.py
diff -u rdiff-backup/rdiff_backup/compare.py:1.4 
rdiff-backup/rdiff_backup/compare.py:1.5
--- rdiff-backup/rdiff_backup/compare.py:1.4    Fri Nov 25 22:35:48 2005
+++ rdiff-backup/rdiff_backup/compare.py        Thu Feb 23 02:57:19 2006
@@ -24,6 +24,7 @@
 
 """
 
+from __future__ import generators
 import Globals, restore, rorpiter, log, backup, static, rpath, hash, robust
 
 def Compare(src_rp, mirror_rp, inc_rp, compare_time):
Index: rdiff-backup/testing/timetest.py
diff -u rdiff-backup/testing/timetest.py:1.13 
rdiff-backup/testing/timetest.py:1.14
--- rdiff-backup/testing/timetest.py:1.13       Wed Apr  6 05:51:59 2005
+++ rdiff-backup/testing/timetest.py    Thu Feb 23 02:57:19 2006
@@ -72,6 +72,14 @@
                assert Time.inttopretty(3661) == "1 hour 1 minute 1 second"
                assert Time.inttopretty(353.234234) == "5 minutes 53.23 seconds"
 
+       def testPrettyTimes(self):
+               """Convert seconds to pretty and back"""
+               now = int(time.time())
+               for i in [1, 200000, now]:
+                       assert Time.prettytotime(Time.timetopretty(i)) == i, i
+               assert Time.prettytotime("now") is None
+               assert Time.prettytotime("12314") is None
+
        def testGenericString(self):
                """Test genstrtotime, conversion of arbitrary string to time"""
                g2t = Time.genstrtotime