Python 3 preparation: avoid basestring.

Author: jsm28

roundup/cgi/templating.py

@@ -1859,7 +1859,7 @@ def now(self, str_interval=None):
 
         ret = date.Date('.', translator=self._client)
 
-        if isinstance(str_interval, basestring):
+        if is_us(str_interval):
             sign = 1
             if str_interval[0] == '-':
                 sign = -1
@@ -1896,7 +1896,7 @@ def field(self, size=30, default=None, format=_marker, popcal=True,
             if default is None:
                 raw_value = None
             else:
-                if isinstance(default, basestring):
+                if is_us(default):
                     raw_value = date.Date(default, translator=self._client)
                 elif isinstance(default, date.Date):
                     raw_value = default
@@ -2874,7 +2874,7 @@ def indexargs_url(self, url, args):
         """
         q = urllib_.quote
         sc = self.special_char
-        l = ['%s=%s'%(k,isinstance(v, basestring) and q(v) or v)
+        l = ['%s=%s'%(k,is_us(v) and q(v) or v)
              for k,v in args.items() if v != None ]
         # pull out the special values (prefixed by @ or :)
         specials = {}

roundup/date.py

@@ -38,6 +38,7 @@ def cmp(a, b):
         return (a > b) - (a < b)
 
 from roundup import i18n
+from roundup.anypy.strings import is_us
 
 # no, I don't know why we must anchor the date RE when we only ever use it
 # in a match()
@@ -765,7 +766,7 @@ def __init__(self, spec, sign=1, allowdate=1, add_granularity=False,
             arith_types = (int, float)
         if isinstance(spec, arith_types):
             self.from_seconds(spec)
-        elif isinstance(spec, basestring):
+        elif is_us(spec):
             self.set(spec, allowdate=allowdate, add_granularity=add_granularity)
         elif isinstance(spec, Interval):
             (self.sign, self.year, self.month, self.day, self.hour,