revert slogging.setupLogging()

guessit-io · Feb 21, 2014 · 468f492 · 468f492
1 parent 5fa4bfb
commit 468f492
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/guessit/__main__.py b/guessit/__main__.py
@@ -19,13 +19,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from __future__ import absolute_import, division, print_function, \
-    unicode_literals
-
+from __future__ import absolute_import, division, print_function, unicode_literals
 import logging
 import os
 
-from guessit import PY2, u, slogging, guess_file_info
+from guessit import PY2, u, guess_file_info
 from guessit.options import option_parser
 
 
@@ -168,8 +166,10 @@ def run_demo(episodes=True, movies=True, options=None):
             guess_file(f, options=options, type='movie')
 
 
-def main(args=None):
-    slogging.setupLogging()
+def main(args=None, setup_logging=True):
+    if setup_logging:
+        from guessit import slogging
+        slogging.setupLogging()
 
     if PY2:  # pragma: no cover
         import codecs

diff --git a/guessit/slogging.py b/guessit/slogging.py
@@ -86,6 +86,4 @@ def format(self, record):
         else:
             ch.setFormatter(SimpleFormatter(with_time, with_thread))
 
-    for existing_handler in logging.getLogger().handlers:
-        logging.getLogger().removeHandler(existing_handler)
     logging.getLogger().addHandler(ch)
diff --git a/guessit/test/test_main.py b/guessit/test/test_main.py
@@ -42,27 +42,27 @@ def tearDown(self):
         sys.stdout = self._stdout
 
     def test_list_properties(self):
-        __main__.main(["-p"])
-        __main__.main(["-l"])
+        __main__.main(["-p"], False)
+        __main__.main(["-l"], False)
 
     def test_list_transformers(self):
-        __main__.main(["--transformers"])
-        __main__.main(["-l", "--transformers"])
+        __main__.main(["--transformers"], False)
+        __main__.main(["-l", "--transformers"], False)
 
     def test_demo(self):
-        __main__.main(["-d"])
-        __main__.main(["-l"])
+        __main__.main(["-d"], False)
+        __main__.main(["-l"], False)
 
     def test_filename(self):
-        __main__.main(["A.Movie.2014.avi"])
-        __main__.main(["A.Movie.2014.avi", "A.2nd.Movie.2014.avi"])
-        __main__.main(["-y", "A.Movie.2014.avi"])
-        __main__.main(["-a", "A.Movie.2014.avi"])
-        __main__.main(["-v", "A.Movie.2014.avi"])
-        __main__.main(["-t", "movie", "A.Movie.2014.avi"])
-        __main__.main(["-t", "episode", "A.Serie.S02E06.avi"])
-        __main__.main(["-i", "hash_mpc", file_in_same_dir(__file__, "1MB")])
-        __main__.main(["-i", "hash_md5", file_in_same_dir(__file__, "1MB")])
+        __main__.main(["A.Movie.2014.avi"], False)
+        __main__.main(["A.Movie.2014.avi", "A.2nd.Movie.2014.avi"], False)
+        __main__.main(["-y", "A.Movie.2014.avi"], False)
+        __main__.main(["-a", "A.Movie.2014.avi"], False)
+        __main__.main(["-v", "A.Movie.2014.avi"], False)
+        __main__.main(["-t", "movie", "A.Movie.2014.avi"], False)
+        __main__.main(["-t", "episode", "A.Serie.S02E06.avi"], False)
+        __main__.main(["-i", "hash_mpc", file_in_same_dir(__file__, "1MB")], False)
+        __main__.main(["-i", "hash_md5", file_in_same_dir(__file__, "1MB")], False)
 
 suite = allTests(TestMain)