[tor-commits] [oonib/master] Merge branch 'darius'

[art at torproject.org]

commit 7b35b7fa5a3d81f6574c7494cde0ac705d4e2cea
Merge: 873b193 168a7c9
Author: Arturo Filastò <art at fuffa.org>
Date:   Mon Apr 21 19:42:16 2014 +0200

    Merge branch 'darius'
    
    * darius:
      Handle writing exceptions that don't have log_exception attribute
      Fix bug introduce in previous PR.
      remove mutable class-level variable that's always overridden by a fresh instance variable with the same name (at least within this code, and I'm going to assume that's how it's meant to be used)
      try/except is not needed here
      remove overbroad try/except
      tighter try/except/with blocks
      tighter try/except/with blocks
      move write() out of the scope of an IOError catch clause not meant for it
      a more-direct test
      note missing import
      remove duplicate import
      clearer logic by eliminating checking_first_packet and bringing assignments to the same variable closer together
      remove unused (and confusing) global
      simpler Config.load()
      fix doctest (python -m doctest __init__.py was failing)
      simpler methods in Storage
      clearer check_paths()
    
    Conflicts:
    	oonib/config.py

 oonib/config.py |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)