Merge branch 'fs#69-deprecated-decorators-param-str' into test-v3

redfam.py

@@ -308,8 +308,8 @@ class RedFamParser( RedFam ):
         """
 
         # On archived red_fams do not delete possibly existing ending
-        if( not self._ending and self._status > 1
-            and self.__mysql.data[ 'ending' ] ):
+        if( not self._ending and self._status > 1 and
+            self.__mysql.data[ 'ending' ] ):
 
                 self._ending = self.__mysql.data[ 'ending' ]
 
@@ -405,7 +405,7 @@ class RedFamParser( RedFam ):
         return (beginning, ending)
 
     @classmethod
-    @deprecated( extract_dates )
+    @deprecated( 'extract_dates' )
     def is_beginning( cls, line ):
         """
         Returns the first timestamp found in line, otherwise None
@@ -418,7 +418,7 @@ class RedFamParser( RedFam ):
         return cls.extract_dates( line )[0]
 
     @classmethod
-    @deprecated( extract_dates )
+    @deprecated( 'extract_dates' )
     def is_ending( cls, line, isarchive=False ):
         """
         Returns the timestamp of done notice ( if one ), otherwise None
@@ -435,7 +435,7 @@ class RedFamParser( RedFam ):
         return cls.extract_dates( line )[1]
 
     @classmethod
-    @deprecated( extract_dates )
+    @deprecated( 'extract_dates' )
     def is_ending2( cls, line ):
         """
         Returns the last timestamp found in line, otherwise None