--- a/thirdparty/google_appengine/google/appengine/ext/gql/__init__.py Tue Apr 21 16:28:13 2009 +0000
+++ b/thirdparty/google_appengine/google/appengine/ext/gql/__init__.py Fri Apr 24 14:16:00 2009 +0000
@@ -327,11 +327,11 @@
"""Cast input values to Key() class using encoded string or tuple list."""
if not len(values) % 2:
return datastore_types.Key.from_path(_app=self.__app, *values)
- elif len(values) == 1 and isinstance(values[0], str):
+ elif len(values) == 1 and isinstance(values[0], basestring):
return datastore_types.Key(values[0])
else:
self.__CastError('KEY', values,
- 'requires an even number of operands'
+ 'requires an even number of operands '
'or a single encoded string')
def __CastGeoPt(self, values):
@@ -530,7 +530,7 @@
raise datastore_errors.BadArgumentError(
'Missing argument for bind, requires argument #%i, '
'but only has %i args.' % (reference, num_args))
- elif isinstance(reference, str):
+ elif isinstance(reference, basestring):
if reference in keyword_args:
return keyword_args[reference]
else:
@@ -919,7 +919,7 @@
assert condition.lower() == 'is'
if condition.lower() != 'in' and operator == 'list':
- sef.__Error('Only IN can process a list of values')
+ self.__Error('Only IN can process a list of values')
self.__filters.setdefault(filter_rule, []).append((operator, parameters))
return True