New Sphinx with extra values to unpack (using if)

This achieves the same that PR #79 but doing it outside the `try... except` block as @Cadair suggested in astropy/astropy#2914

I let you choose which one is better.