FFC

Merge lp:~martinal/ffc/trunk into lp:ffc

  1. trunk
  2. Merge into main
Proposed by Martin Sandve Alnæs
Status: Merged
Merged at revision: 1745
Proposed branch: lp:~martinal/ffc/trunk
Merge into: lp:ffc
Diff against target: 25 lines (+2/-2)
2 files modified
ffc/quadrature/optimisedquadraturetransformer.py (+1/-1)
ffc/quadrature/quadraturetransformer.py (+1/-1)
To merge this branch: bzr merge lp:~martinal/ffc/trunk
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+98466@code.launchpad.net

Description of the change

Just changed ufl.expr to ufl.classes in two imports.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ffc/quadrature/optimisedquadraturetransformer.py'
2--- ffc/quadrature/optimisedquadraturetransformer.py 2011-11-22 22:08:46 +0000
3+++ ffc/quadrature/optimisedquadraturetransformer.py 2012-03-20 18:13:24 +0000
4@@ -33,7 +33,7 @@
5 from ufl.classes import IntValue
6 from ufl.classes import FloatValue
7 from ufl.classes import Coefficient
8-from ufl.expr import Operator
9+from ufl.classes import Operator
10
11 # UFL Algorithms.
12 from ufl.algorithms.printing import tree_format
13
14=== modified file 'ffc/quadrature/quadraturetransformer.py'
15--- ffc/quadrature/quadraturetransformer.py 2011-11-22 22:08:46 +0000
16+++ ffc/quadrature/quadraturetransformer.py 2012-03-20 18:13:24 +0000
17@@ -34,7 +34,7 @@
18 from ufl.classes import IntValue
19 from ufl.classes import FloatValue
20 from ufl.classes import Coefficient
21-from ufl.expr import Operator
22+from ufl.classes import Operator
23
24 # UFL Algorithms.
25 from ufl.algorithms.printing import tree_format