Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions nose/plugins/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@

try:
import cPickle as pickle
except:
except ImportError:
import pickle
try:
from cStringIO import StringIO
except:
except ImportError:
from StringIO import StringIO


Expand Down Expand Up @@ -155,7 +155,7 @@ def generate(self, *arg, **kw):
yield r
except (KeyboardInterrupt, SystemExit):
raise
except:
except Exception:
exc = sys.exc_info()
yield Failure(*exc)
continue
Expand Down