sympy/sympy — pull request #2854 by smichr (2014-01-31 03:05:20+00:00)
Title: watch out for E in exptrigsimp

Since E and exp are being collected, an error can happen when e2 is E because then it has no args (but the arg of E should be 1 (if it were exp() instead of E).