shebangs need to point at python2

[sfa.git] / sfatables / commands / moo.py

diff --git a/sfatables/commands/moo.py b/sfatables/commands/moo.py
index bd19a9d..65b7598 100644 (file)
--- a/sfatables/commands/moo.py
+++ b/sfatables/commands/moo.py
@@ -1,5 +1,7 @@
 import os, time
 
+from sfa.util.py23 import StringType
+
 class Command:
     commandline_options = []
     help = "Add a new rule"
@@ -122,7 +124,7 @@ class Command:
                 try:
                     self.type_check(name, value, item, args)
                     return
-                except SfaInvalidArgument, fault:
+                except SfaInvalidArgument as fault:
                     pass
             raise fault
 
@@ -152,7 +154,7 @@ class Command:
 
         # Strings are a special case. Accept either unicode or str
         # types if a string is expected.
-        if expected_type in StringTypes and isinstance(value, StringTypes):
+        if issubclass(expected_type, StringType) and isinstance(value, StringType):
             pass
 
         # Integers and long integers are also special types. Accept
@@ -167,7 +169,7 @@ class Command:
                                      name)
 
         # If a minimum or maximum (length, value) has been specified
-        if expected_type in StringTypes:
+        if issubclass(expected_type, StringType):
             if min is not None and \
                len(value.encode(self.api.encoding)) < min:
                 raise SfaInvalidArgument("%s must be at least %d bytes long" % (name, min))