~david-goetz/swift/zero_byte_obj_audit

« back to all changes in this revision

Viewing changes to bin/st

  • 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:
38
38
 
39
39
try:
40
40
    from eventlet import sleep
41
 
except:
 
41
except Exception:
42
42
    from time import sleep
43
43
 
44
44
try:
45
45
    from swift.common.bufferedhttp \
46
46
        import BufferedHTTPConnection as HTTPConnection
47
 
except:
 
47
except Exception:
48
48
    from httplib import HTTPConnection
49
49
 
50
50
 
91
91
                    else:
92
92
                        res.append(val)
93
93
                return eval(''.join(res), {}, consts)
94
 
            except:
 
94
            except Exception:
95
95
                raise AttributeError()
96
96
 
97
97
 
1616
1616
        conn.put_container(args[0])
1617
1617
        if options.segment_size is not None:
1618
1618
            conn.put_container(args[0] + '_segments')
1619
 
    except:
 
1619
    except Exception:
1620
1620
        pass
1621
1621
    try:
1622
1622
        for arg in args[1:]:
1723
1723
        error_thread.abort = True
1724
1724
        while error_thread.isAlive():
1725
1725
            error_thread.join(0.01)
1726
 
    except:
 
1726
    except Exception:
1727
1727
        for thread in threading_enumerate():
1728
1728
            thread.abort = True
1729
1729
        raise