diff options
author | Stefan Rado <px4@sradonia.net> | 2014-02-18 22:07:42 +0100 |
---|---|---|
committer | Stefan Rado <px4@sradonia.net> | 2014-02-18 22:07:42 +0100 |
commit | 55e66f5ad1fecb02bcb9782265303e20756b5cb9 (patch) | |
tree | 1a23f81eb1acb4f69edb2779d81d5a1ada1cf63a | |
parent | e9feef8ff6ef1f4dcc7b55a75301e2275e662dae (diff) | |
download | px4-firmware-55e66f5ad1fecb02bcb9782265303e20756b5cb9.tar.gz px4-firmware-55e66f5ad1fecb02bcb9782265303e20756b5cb9.tar.bz2 px4-firmware-55e66f5ad1fecb02bcb9782265303e20756b5cb9.zip |
Rename Scanner and Parser classes to SourceScanner and SourceParser to avoid naming conflicts.
-rwxr-xr-x | Tools/px4params/px_process_params.py | 10 | ||||
-rw-r--r-- | Tools/px4params/srcparser.py | 2 | ||||
-rw-r--r-- | Tools/px4params/srcscanner.py (renamed from Tools/px4params/scanner.py) | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Tools/px4params/px_process_params.py b/Tools/px4params/px_process_params.py index 7799f6348..8503a2f4c 100755 --- a/Tools/px4params/px_process_params.py +++ b/Tools/px4params/px_process_params.py @@ -39,19 +39,19 @@ # definitions, and outputs list of parameters in XML and DokuWiki formats. # -import scanner +import srcscanner import srcparser import output_xml import output_dokuwiki_tables import output_dokuwiki_listings # Initialize parser -prs = srcparser.Parser() +parser = srcparser.SourceParser() # Scan directories, and parse the files -sc = scanner.Scanner() -sc.ScanDir("../../src", prs) -groups = prs.GetParamGroups() +scanner = srcscanner.SourceScanner() +scanner.ScanDir("../../src", parser) +groups = parser.GetParamGroups() # Output into XML out = output_xml.XMLOutput(groups) diff --git a/Tools/px4params/srcparser.py b/Tools/px4params/srcparser.py index 9e202d3b8..0a4d21d26 100644 --- a/Tools/px4params/srcparser.py +++ b/Tools/px4params/srcparser.py @@ -72,7 +72,7 @@ class Parameter(object): """ return self.fields.get(code) -class Parser(object): +class SourceParser(object): """ Parses provided data and stores all found parameters internally. """ diff --git a/Tools/px4params/scanner.py b/Tools/px4params/srcscanner.py index 43fd35e60..d7eca72d7 100644 --- a/Tools/px4params/scanner.py +++ b/Tools/px4params/srcscanner.py @@ -2,7 +2,7 @@ import os import re import codecs -class Scanner(object): +class SourceScanner(object): """ Traverses directory tree, reads all source files, and passes their contents to the Parser. |