← Back to branch summary

~david-goetz/swift/zero_byte_obj_audit

« back to all changes in this revision

Viewing changes to swift/auth/server.py

  • Committer: Tarmac
  • Author(s): David Goetz
  • Date: 2011-01-26 23:56:47 UTC
  • mfrom: (176.1.2 bare_except)
  • Revision ID: tarmac-20110126235647-rvhywh8z0vh2qm4j
Removing bare excepts from code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
swift/auth/server.py
96
96
            msg = _('No super_admin_key set in conf file! Exiting.')
97
97
            try:
98
98
                self.logger.critical(msg)
99
 
            except:
 
99
            except Exception:
100
100
                pass
101
101
            raise ValueError(msg)
102
102
        self.swift_dir = conf.get('swift_dir', '/etc/swift')
238
238
        except Exception, err:
239
239
            try:
240
240
                conn.close()
241
 
            except:
 
241
            except Exception:
242
242
                pass
243
243
            self.conn = get_db_connection(self.db_file)
244
244
            raise err
651
651
            else:
652
652
                return HTTPBadRequest(request=env)(env, start_response)
653
653
            response = handler(req)
654
 
        except:
 
654
        except Exception:
655
655
            self.logger.exception(
656
656
                    _('ERROR Unhandled exception in ReST request'))
657
657
            return HTTPServiceUnavailable(request=req)(env, start_response)