From 89a783149eddc485209295a05c7a02badee72195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= <inform@tiker.net>
Date: Thu, 12 Oct 2017 09:48:42 -0400
Subject: [PATCH] Revert "Merge branch 'uneval' into 'master'"

This reverts merge request !63
---
 sumpy/expansion/multipole.py |  4 ++--
 sumpy/symbolic.py            | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/sumpy/expansion/multipole.py b/sumpy/expansion/multipole.py
index 92ae80f3..4e226cd9 100644
--- a/sumpy/expansion/multipole.py
+++ b/sumpy/expansion/multipole.py
@@ -178,11 +178,11 @@ class VolumeTaylorMultipoleExpansionBase(MultipoleExpansionBase):
                     assert n >= k
                     from sympy import binomial
                     contrib *= (binomial(n, k)
-                            * sym.UnevaluatedExpr(dvec[idim]/tgt_rscale)**(n-k))
+                            * dvec[idim]**(n-k))
 
                 result[i] += (
                         contrib
-                        * sym.UnevaluatedExpr(src_rscale/tgt_rscale)**sum(src_mi))
+                        * (src_rscale**sum(src_mi) / tgt_rscale**sum(tgt_mi)))
 
             result[i] /= mi_factorial(tgt_mi)
 
diff --git a/sumpy/symbolic.py b/sumpy/symbolic.py
index c7ed61e6..c213f4b9 100644
--- a/sumpy/symbolic.py
+++ b/sumpy/symbolic.py
@@ -98,19 +98,6 @@ def _coeff_isneg(a):
     return a.is_Number and a.is_negative
 
 
-have_unevaluated_expr = False
-if not USE_SYMENGINE:
-    try:
-        from sympy import UnevaluatedExpr
-        have_unevaluated_expr = True
-    except ImportError:
-        pass
-
-if not have_unevaluated_expr:
-    def UnevaluatedExpr(x):  # noqa
-        return x
-
-
 # {{{ debugging of sympy CSE via Maxima
 
 class _DerivativeKiller(IdentityMapperBase):
-- 
GitLab