@@ -3,6 +3,13 @@ All rights reserved. App Engine Python SDK - Release Notes +Version 1.2.7 - October 14, 2009 +================================ + - Changed the 'key' parameter to Model.__init__ to be keyword only. + - Fixed taskqueue import in Remote API. + http://code.google.com/p/googleappengine/issues/detail?id=2259 + + Version 1.2.6 - September 17, 2009 ================================== - Added incoming email support. google_appengine/RELEASE_NOTES @@ -1,3 +1,3 @@ -release: "1.2.6" -timestamp: 1253219443 +release: "1.2.7" +timestamp: 1255546941 api_versions: ['1'] google_appengine/VERSION @@ -621,7 +621,6 @@ class Model(object): def __init__(self, parent=None, key_name=None, - key=None, _app=None, _from_entity=False, **kwds): @@ -647,10 +646,11 @@ class Model(object): parent: Parent instance for this instance or None, indicating a top- level instance. key_name: Name for new model instance. - key: Key instance for this instance, overrides parent and key_name _from_entity: Intentionally undocumented. - args: Keyword arguments mapping to properties of model. + kwds: Keyword arguments mapping to properties of model. Also: + key: Key instance for this instance, overrides parent and key_name """ + key = kwds.get('key', None) if key is not None: if isinstance(key, (tuple, list)): key = Key.from_path(*key) @@ -703,6 +703,11 @@ class Model(object): self._key = None self._entity = None + if _app is not None and isinstance(_app, Key): + raise BadArgumentError('_app should be a string; received Key(\'%s\'):\n' + ' This may be the result of passing \'key\' as ' + 'a positional parameter in SDK 1.2.6. Please ' + 'only pass \'key\' as a keyword parameter.' % _app) self._app = _app for prop in self.properties().values(): google_appengine/google/appengine/ext/db/__init__.py @@ -42,6 +42,7 @@ import logging import os import pickle import sha +import sys import wsgiref.handlers import yaml @@ -54,7 +55,12 @@ from google.appengine.api import users from google.appengine.api.capabilities import capability_service_pb from google.appengine.api.images import images_service_pb from google.appengine.api.memcache import memcache_service_pb -from google.appengine.api.taskqueue import taskqueue_service_pb +try: + __import__('google.appengine.api.labs.taskqueue.taskqueue_service_pb') + taskqueue_service_pb = sys.modules.get( + 'google.appengine.api.labs.taskqueue.taskqueue_service_pb') +except ImportError: + from google.appengine.api.taskqueue import taskqueue_service_pb from google.appengine.api.xmpp import xmpp_service_pb from google.appengine.datastore import datastore_pb from google.appengine.ext import webapp google_appengine/google/appengine/ext/remote_api/handler.py 5607636c2429d5861661f3ab0a49d58752b6b4de Jason Smith jhs@proven-corporation.com http://github.com/jhs/google-app-engine/commit/83fee00c1cdec2bcc54066bac2f468303517350b 83fee00c1cdec2bcc54066bac2f468303517350b 2009-10-16T08:12:30-07:00 2009-10-16T08:12:30-07:00 Import version 1.2.7 9103d211e6a6490c96bd5be4d3abb74b0ec22fe8 Jason Smith jhs@proven-corporation.com