diff options
author | Jon Bergli Heier <snakebite@jvnv.net> | 2011-11-05 10:13:34 +0100 |
---|---|---|
committer | Jon Bergli Heier <snakebite@jvnv.net> | 2011-11-05 10:14:08 +0100 |
commit | 3cde6000b7b5ceffc0dd9a8a0f053f7652bebeeb (patch) | |
tree | dcd1afae0c4e38b9667579a62fda9d9599ca4aed /pastepy.py | |
parent | a50c52ed2c6b82639b4dbbb50c2d2633bb3699e9 (diff) |
Catch exceptions on non-existent pastes and return an empty 404 page.
Diffstat (limited to 'pastepy.py')
-rw-r--r-- | pastepy.py | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -120,8 +120,12 @@ class Paste(object): try: cache = session.query(db.Cache).filter_by(paste_hash = hash).one() paste = cache.paste - except: # No cache found, generate it. - paste = session.query(db.Paste).filter_by(hash = hash).one() + except db.NoResultFound: # No cache found, generate it. + try: + paste = session.query(db.Paste).filter_by(hash = hash).one() + except db.NoResultFound: + self.start_response('404 Not Found', []) + return [] try: lexername, text = get_formatted(paste.syntax, paste.text if type(paste.text) == unicode else paste.text.decode('utf8')) except: |