Merge branch 'garth/remove-deprecated-code'

FEniCS · Jun 27, 2017 · 062d7b4 · 062d7b4
2 parents d5c56a5 + daee570
commit 062d7b4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/ufl/argument.py b/ufl/argument.py
@@ -96,11 +96,6 @@ def ufl_element(self):
         # use .ufl_function_space().ufl_element() instead.")
         return self._ufl_function_space.ufl_element()
 
-    # def element(self):
-    #    "Deprecated, please use .ufl_function_space().ufl_element() instead."
-    #    deprecate("Argument.element() is deprecated, please use Argument.ufl_element() instead.")
-    #    return self.ufl_element()
-
     def number(self):
         "Return the Argument number."
         return self._number

diff --git a/ufl/coefficient.py b/ufl/coefficient.py
@@ -84,11 +84,6 @@ def ufl_element(self):
         "Shortcut to get the finite element of the function space of this coefficient."
         return self._ufl_function_space.ufl_element()
 
-    # def element(self):
-    #    "Deprecated, please use Coefficient.ufl_element() instead."
-    #    deprecate("Coefficient.element() is deprecated, please use Coefficient.ufl_element() instead.")
-    #    return self.ufl_element()
-
     def is_cellwise_constant(self):
         "Return whether this expression is spatially constant over each cell."
         return self.ufl_element().is_cellwise_constant()