Automated rollback of change 128408292

Change: 128422305

Author: tensorflower-gardener

tensorflow/contrib/framework/BUILD

@@ -38,7 +38,7 @@ py_test(
 py_test(
     name = "ops_test",
     size = "small",
-    srcs = ["python/ops/ops_test.py"],
+    srcs = glob(["python/ops/ops_test.py"]),
     srcs_version = "PY2AND3",
     deps = ["//tensorflow:tensorflow_py"],
 )
@@ -51,24 +51,17 @@ py_test(
     deps = ["//tensorflow:tensorflow_py"],
 )
 
-py_test(
-    name = "deprecation_test",
-    srcs = ["python/framework/deprecation_test.py"],
-    srcs_version = "PY2AND3",
-    deps = ["//tensorflow:tensorflow_py"],
-)
-
 py_test(
     name = "tensor_util_test",
-    srcs = ["python/framework/tensor_util_test.py"],
+    srcs = glob(["python/framework/tensor_util_test.py"]),
     srcs_version = "PY2AND3",
     deps = ["//tensorflow:tensorflow_py"],
 )
 
 py_test(
     name = "variables_test",
     size = "small",
-    srcs = ["python/ops/variables_test.py"],
+    srcs = glob(["python/ops/variables_test.py"]),
     srcs_version = "PY2AND3",
     deps = ["//tensorflow:tensorflow_py"],
 )

tensorflow/contrib/framework/python/framework/deprecation.py

@@ -36,11 +36,9 @@ def _get_qualified_name(function):
 
 def _add_deprecation_to_docstring(doc, date, instructions):
   """Adds a deprecation notice to a docstring."""
-  if not doc:
-    lines = ['DEPRECATED FUNCTION']
-  else:
-    lines = doc.splitlines()
-    lines[0] += ' (deprecated)'
+  lines = doc.splitlines()
+
+  lines[0] += ' (deprecated)'
 
   notice = [
       '',
@@ -99,15 +97,11 @@ def deprecated(date, instructions):
 
   def deprecated_wrapper(func):
     """Deprecation wrapper."""
-    if not hasattr(func, '__call__'):
-      raise ValueError(
-          '%s is not a function.'
-          'If this is a property, add @deprecated after @property.' % func)
     def new_func(*args, **kwargs):
-      logging.warning('%s (from %s) is deprecated and will be removed after %s.'
-                      '\nInstructions for updating:\n%s',
-                      _get_qualified_name(func), func.__module__,
-                      date, instructions)
+      logging.warn('%s (from %s) is deprecated and will be removed after %s.\n'
+                   'Instructions for updating:\n%s',
+                   _get_qualified_name(func), func.__module__,
+                   date, instructions)
       return func(*args, **kwargs)
     new_func.__name__ = func.__name__
     new_func.__doc__ = _add_deprecation_to_docstring(func.__doc__, date,