标注过期函数

Author: zhenwei-li

src/com/dvsnier/directory/common_dir.py

@@ -1,41 +1,60 @@
 # -*- coding:utf-8 -*-
 
-import os
+import datetime
 # import logging
+import os
 import time
-import datetime
+
+from deprecated import deprecated
 
 
+@deprecated(
+    version='0.0.2.dev1',
+    reason="You should use the from com.dvsnier.directory.common_directory import CommonDirectory, that We will delete \
+this method after extending 2-3 versions")
 def generate_complex_file_name(output_dir_name, file_name):
     'the generate complex file name'
     output_dir = mk_output_dir(output_dir_name)
     name = str("%s_%s.log" % (file_name, int(time.time())))
     return os.path.join(output_dir, name)
 
 
+@deprecated(
+    version='0.0.2.dev1',
+    reason="You should use the from com.dvsnier.directory.common_directory import CommonDirectory, that We will delete \
+this method after extending 2-3 versions")
 def generate_fmt_file_name(output_dir_name, file_name, fmt='%Y%m%d_%H%M%S'):
     'the generate out with fmt file name'
     output_dir = mk_output_dir(output_dir_name)
-    name = str("%s_%s.txt" %
-               (file_name, datetime.datetime.now().strftime(fmt)))
+    name = str("%s_%s.txt" % (file_name, datetime.datetime.now().strftime(fmt)))
     return os.path.join(output_dir, name)
 
 
+@deprecated(
+    version='0.0.2.dev1',
+    reason="You should use the from com.dvsnier.directory.common_directory import CommonDirectory, that We will delete \
+this method after extending 2-3 versions")
 def generate_file_name(output_dir_name, file_name):
     'the generate out file name'
     output_dir = mk_output_dir(output_dir_name)
     return os.path.join(output_dir, file_name)
 
 
+@deprecated(
+    version='0.0.2.dev1',
+    reason="You should use the from com.dvsnier.directory.common_directory import CommonDirectory, that We will delete \
+this method after extending 2-3 versions")
 def generate_file_name_only(output_dir_name, file_name):
     'the generate file name only'
     output_dir = mk_dir(output_dir_name)
     return os.path.join(output_dir, file_name)
 
 
-def generate_complex_or_fmt_file_name(output_dir_name,
-                                      file_name,
-                                      fmt='%Y%m%d_%H%M%S'):
+@deprecated(
+    version='0.0.2.dev1',
+    reason="You should use the from com.dvsnier.directory.common_directory import CommonDirectory, that We will delete \
+this method after extending 2-3 versions")
+def generate_complex_or_fmt_file_name(output_dir_name, file_name, fmt='%Y%m%d_%H%M%S'):
     'the generate out complex or fmt file name'
     output_dir = mk_output_dir(output_dir_name)
     if file_name is None or len(file_name.strip()) == 0:
@@ -44,15 +63,17 @@ def generate_complex_or_fmt_file_name(output_dir_name,
     if '.' in file_name:
         rdot_index = file_name.rfind('.')
         if rdot_index > 0:
-            file_name = str("%s_%s%s" % (file_name[0:rdot_index],
-                                         datetime.datetime.now().strftime(fmt),
-                                         file_name[rdot_index:]))
+            file_name = str("%s_%s%s" %
+                            (file_name[0:rdot_index], datetime.datetime.now().strftime(fmt), file_name[rdot_index:]))
     else:
-        file_name = str("%s_%s" %
-                        (file_name, datetime.datetime.now().strftime(fmt)))
+        file_name = str("%s_%s" % (file_name, datetime.datetime.now().strftime(fmt)))
     return os.path.join(output_dir, file_name)
 
 
+@deprecated(
+    version='0.0.2.dev1',
+    reason="You should use the from com.dvsnier.directory.common_directory import CommonDirectory, that We will delete \
+this method after extending 2-3 versions")
 def mk_dir(output_dir_name):
     'the initialize global output dir'
     project_dir = os.path.abspath('.')
@@ -62,6 +83,10 @@ def mk_dir(output_dir_name):
     return output_dir
 
 
+@deprecated(
+    version='0.0.2.dev1',
+    reason="You should use the from com.dvsnier.directory.common_directory import CommonDirectory, that We will delete \
+this method after extending 2-3 versions")
 def mk_output_dir(output_dir_name):
     'the initialize output dir'
     # root_dir = os.path.dirname(os.path.abspath('.'))
@@ -79,6 +104,10 @@ def mk_output_dir(output_dir_name):
     return output_dir
 
 
+@deprecated(
+    version='0.0.2.dev1',
+    reason="You should use the from com.dvsnier.directory.common_directory import CommonDirectory, that We will delete \
+this method after extending 2-3 versions")
 def mk_children_dir(output_dir_name, sub_dir_name):
     'the initialize children dir'
     if not os.path.exists(output_dir_name):

tests/com/dvsnier/directory/test_common_dir.py

@@ -10,27 +10,25 @@ class Test_Common_Dir(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         print("...the set up...")
+        print('')
 
     def setUp(self):
-        return super(Test_Common_Dir, self).setUp()
+        super(Test_Common_Dir, self).setUp()
 
     def test_generate_complex_file_name(self):
         'the test generate complex file name'
         dir_name = 'https'
         file_name = 'test_name'
         output = generate_complex_file_name(dir_name, file_name)
         print("\nthe test generate_complex_file_name(%s) is succeed." % output)
-        self.assertIsNotNone(output,
-                             'test_generate_complex_file_name is error.')
+        self.assertIsNotNone(output, 'test_generate_complex_file_name is error.')
 
     def test_generate_fmt_file_name(self):
         'the test generate fmt file name'
         dir_name = 'https'
         file_name = 'test_name'
         # output = generate_fmt_file_name(dir_name, file_name)
-        output = generate_fmt_file_name(dir_name,
-                                        file_name,
-                                        fmt='%Y%m%d_%H%M%S.%f')
+        output = generate_fmt_file_name(dir_name, file_name, fmt='%Y%m%d_%H%M%S.%f')
         print("\nthe test generate_fmt_file_name(%s) is succeed." % output)
         self.assertIsNotNone(output, 'generate_fmt_file_name is error.')
 
@@ -47,8 +45,7 @@ def test_generate_file_name_only(self):
         dir_name = 'out/https_2'
         file_name = 'test_name'
         output = generate_file_name_only(dir_name, file_name)
-        print("\nthe test test_generate_file_name_only(%s) is succeed." %
-              output)
+        print("\nthe test test_generate_file_name_only(%s) is succeed." % output)
         self.assertIsNotNone(output, 'test_generate_file_name_only is error.')
 
     def test_generate_complex_or_fmt_file_name(self):
@@ -66,11 +63,8 @@ def test_generate_complex_or_fmt_file_name(self):
         # file_name = '.test_name.txt.log.'
         # file_name = 'test.name.txt.log'
         output = generate_complex_or_fmt_file_name(dir_name, file_name)
-        print(
-            "\nthe test test_generate_complex_or_fmt_file_name(%s) is succeed."
-            % output)
-        self.assertIsNotNone(
-            output, 'test_generate_complex_or_fmt_file_name is error.')
+        print("\nthe test test_generate_complex_or_fmt_file_name(%s) is succeed." % output)
+        self.assertIsNotNone(output, 'test_generate_complex_or_fmt_file_name is error.')
 
     def test_mk_dir(self):
         'the test mk dir'
@@ -94,12 +88,15 @@ def test_mk_children_dir(self):
         self.assertIsNotNone(output, 'test_mk_children_dir is error.')
 
     def tearDown(self):
-        return super(Test_Common_Dir, self).tearDown()
+        super(Test_Common_Dir, self).tearDown()
 
     @classmethod
     def tearDownClass(cls):
+        print('')
         print("...the tear down...")
 
 
 if __name__ == '__main__':
-    unittest.main()
+    suite = unittest.TestLoader().loadTestsFromTestCase(Test_Common_Dir)
+    unittest.TextTestRunner(verbosity=2).run(suite)
+    # unittest.main()