X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Futil%2Fmethod.py;fp=sfa%2Futil%2Fmethod.py;h=b3d7d1a7808ad23a81f75324b6c8476ada0f2e44;hp=e99d55a8b020cc13eaa4658c5cfc5f5cb6c727a1;hb=04acd3228e5911d36d0cd58dc35b9319fc558e17;hpb=e5537b113b6fe5874fdcd5b12414568500aa106c diff --git a/sfa/util/method.py b/sfa/util/method.py index e99d55a8..b3d7d1a7 100644 --- a/sfa/util/method.py +++ b/sfa/util/method.py @@ -8,7 +8,6 @@ from types import IntType, LongType import textwrap from sfa.util.sfalogging import logger -from sfa.util.py23 import StringType from sfa.util.faults import SfaFault, SfaInvalidAPIMethod, SfaInvalidArgumentCount, SfaInvalidArgument from sfa.storage.parameter import Parameter, Mixed, python_type, xmlrpc_type @@ -239,7 +238,7 @@ class Method: # Strings are a special case. Accept either unicode or str # types if a string is expected. - if issubclass(expected_type, StringType) and isinstance(value, StringType): + if issubclass(expected_type, str) and isinstance(value, str): pass # Integers and long integers are also special types. Accept @@ -254,7 +253,7 @@ class Method: name) # If a minimum or maximum (length, value) has been specified - if issubclass(expected_type, StringType): + if issubclass(expected_type, str): if min is not None and \ len(value.encode(self.api.encoding)) < min: raise SfaInvalidArgument(