Skip to content

Commit

Permalink
Refactor lizard_main() into main()
Browse files Browse the repository at this point in the history
  • Loading branch information
rakhimov committed Oct 18, 2016
1 parent 429a60d commit ff5b48b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
11 changes: 8 additions & 3 deletions lizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -925,8 +925,13 @@ def expand_extensions(existing):
analyze_file = FileAnalyzer(get_extensions([])) # pylint: disable=C0103


def lizard_main(argv):
options = parse_args(argv)
def main(argv=None):
"""Command-line entrance to Lizard.
Args:
argv: Arguments vector; if None, sys.argv by default.
"""
options = parse_args(argv or sys.argv)
printer = options.printer or print_result
schema = OutputScheme(options.extensions)
if schema.any_silent():
Expand All @@ -947,4 +952,4 @@ def lizard_main(argv):


if __name__ == "__main__":
lizard_main(sys.argv)
main()
6 changes: 2 additions & 4 deletions profile.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
from lizard import lizard_main
from lizard import main
import cProfile, pstats, StringIO
import sys


if __name__ == "__main__":
pr = cProfile.Profile()
pr.enable()
lizard_main(sys.argv)
main()
pr.disable()
s = StringIO.StringIO()
sortby = 'tottime'
ps = pstats.Stats(pr, stream=s).sort_stats(sortby)
ps.print_stats()
print s.getvalue()


9 changes: 3 additions & 6 deletions test/testApplication.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import unittest
from mock import patch
import lizard
from lizard import lizard_main
import os
import sys

Expand All @@ -20,7 +19,7 @@ def check_empty_result(result, options, scheme):

os_walk.return_value = [('.', [], [])]
print_result.side_effect = check_empty_result
lizard_main(['lizard'])
lizard.main(['lizard'])

def testFilesWithFunction(self, print_result, os_walk, mock_open, _):
def check_result(result, options, scheme):
Expand All @@ -31,7 +30,7 @@ def check_result(result, options, scheme):
os_walk.return_value = [('.', [], ['a.cpp'])]
mock_open.return_value = "void foo(){}"
print_result.side_effect = check_result
lizard_main(['lizard'])
lizard.main(['lizard'])


class IntegrationTests(unittest.TestCase):
Expand Down Expand Up @@ -63,7 +62,7 @@ def store_result(result, options, scheme):
return self.returned_warning_count
mock_open.return_value = src
print_result.side_effect = store_result
lizard_main(argv)
lizard.main(argv)
return self.fileInfos

@patch('lizard.md5_hash_file')
Expand All @@ -89,5 +88,3 @@ def test_exit_code(self, mock_exit):
self.returned_warning_count = 6
self.runApplicationWithArgv(['lizard', '-C5'])
mock_exit.assert_called_with(1)


0 comments on commit ff5b48b

Please sign in to comment.