prune-older: paper over python 3's integer type changes

Signed-off-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/cmd/prune-older-cmd.py b/cmd/prune-older-cmd.py
index 6c67b69bfc72e1e717d6abfa6c5cd1aea3b12c66..96554233644b0bd789456627a31104834dc133a5 100755 (executable)
--- a/cmd/prune-older-cmd.py
+++ b/cmd/prune-older-cmd.py
@@ -13,6 +13,7 @@ from time import localtime, strftime, time
 import re, sys
 
 from bup import git, options
+from bup.compat import int_types
 from bup.gc import bup_gc
 from bup.helpers import die_if_errors, log, partition, period_as_secs
 from bup.repo import LocalRepo
@@ -85,8 +86,8 @@ opt, flags, roots = o.parse(sys.argv[1:])
 if not opt.unsafe:
     o.fatal('refusing to run dangerous, experimental command without --unsafe')
 
-now = int(time()) if not opt.wrt else opt.wrt
-if not isinstance(now, (int, long)):
+now = int(time()) if opt.wrt is None else opt.wrt
+if not isinstance(now, int_types):
     o.fatal('--wrt value ' + str(now) + ' is not an integer')
 
 period_start = {}

diff --git a/lib/bup/compat.py b/lib/bup/compat.py
index 7b20ebccfe5afaa7e0ea968f7e771b3c81aac7e7..f45d9ab53259abd95b331e5e413c49095997ac84 100644 (file)
--- a/lib/bup/compat.py
+++ b/lib/bup/compat.py
@@ -28,6 +28,7 @@ if py3:
     from shlex import quote
     range = range
     str_type = str
+    int_types = (int,)
 
     def add_ex_tb(ex):
         """Do nothing (already handled by Python 3 infrastructure)."""
@@ -70,6 +71,7 @@ else:  # Python 2
     from os import environ
     range = xrange
     str_type = basestring
+    int_types = (int, long)
 
     def add_ex_tb(ex):
         """Add a traceback to ex if it doesn't already have one.  Return ex.