[Merge] lp:~jtaylor/ubuntu-dev-tools/lp-shell-ipython into lp:ubuntu-dev-tools

[Julian Taylor]

the disable annotation is scoped, its only valid for the except block
-- 
https://code.launchpad.net/~jtaylor/ubuntu-dev-tools/lp-shell-ipython/+merge/71488
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~jtaylor/ubuntu-dev-tools/lp-shell-ipython into lp:ubuntu-dev-tools.