Merge pull request #59 from skirpichev/misc-fixes

Misc fixes
diofant · Apr 16, 2015 · c491416 · c491416
2 parents 51902e9 + 4e2385a
commit c491416
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/sympy/printing/pretty/pretty.py b/sympy/printing/pretty/pretty.py
@@ -544,6 +544,8 @@ def _print_Limit(self, l):
         e, z, z0, dir = l.args
 
         E = self._print(e)
+        if e.is_Add:
+            E = prettyForm(*E.parens())
         Lim = prettyForm('lim')
 
         LimArg = self._print(z)

diff --git a/sympy/printing/pretty/tests/test_pretty.py b/sympy/printing/pretty/tests/test_pretty.py
@@ -3141,6 +3141,22 @@ def test_pretty_limits():
     assert pretty(expr) == ascii_str
     assert upretty(expr) == ucode_str
 
+    expr = Limit(x - 1/y, x, 1)
+    ascii_str = \
+"""\
+     /    1\\\n\
+ lim |x - -|\n\
+x->1+\    y/\
+"""
+    ucode_str = \
+u("""\
+     ⎛    1⎞\n\
+ lim ⎜x - ─⎟\n\
+x─→1⁺⎝    y⎠\
+""")
+    assert pretty(expr) == ascii_str
+    assert upretty(expr) == ucode_str
+
 
 def test_pretty_RootOf():
     expr = RootOf(x**5 + 11*x - 2, 0)

diff --git a/sympy/tests/test_wester.py b/sympy/tests/test_wester.py
@@ -2064,8 +2064,7 @@ def test_T9():
 
 @XFAIL
 def test_T10():
-    # raises PoleError should return euler-mascheroni constant
-    limit(zeta(x) - 1/(x - 1), x, 1)
+    limit(zeta(x) - 1/(x - 1), x, 1) == EulerGamma
 
 
 @XFAIL