Fixed taskqueue error catching

Arachnid · Mar 31, 2011 · aef6f13 · aef6f13
1 parent e5017df
commit aef6f13
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/post_deploy.py b/post_deploy.py
@@ -1,7 +1,7 @@
 import datetime
 import logging
 import os
-from google.appengine.api.labs import taskqueue
+from google.appengine.api import taskqueue
 from google.appengine.ext import deferred
 
 import config
@@ -89,7 +89,7 @@ def run_deploy_task():
   task_name = 'deploy-%s' % os.environ['CURRENT_VERSION_ID'].replace('.', '-')
   try:
     deferred.defer(try_post_deploy, _name=task_name, _countdown=10)
-  except (taskqueue.TaskAlreadyExistsError, taskqueue.TombstonedTaskError), e:
+  except (taskqueue.TaskAlreadyExistsError, taskqueue.taskqueue.TombstonedTaskError), e:
     pass
 
 

diff --git a/static.py b/static.py
@@ -2,7 +2,7 @@
 import hashlib
 
 from google.appengine.api import memcache
-from google.appengine.api.labs import taskqueue
+from google.appengine.api import taskqueue
 from google.appengine.ext import db
 from google.appengine.ext import deferred
 from google.appengine.datastore import entity_pb
@@ -88,7 +88,7 @@ def set(path, body, content_type, indexed=True, **kwargs):
           utils._regenerate_sitemap,
           _name='sitemap-%s' % (now.strftime('%Y%m%d%H%M'),),
           _eta=eta)
-  except (taskqueue.TaskAlreadyExistsError, taskqueue.TombstonedTaskError), e:
+  except (taskqueue.taskqueue.TaskAlreadyExistsError, taskqueue.taskqueue.TombstonedTaskError), e:
     pass
   return content