Mercurial Repositories > eric / changeset
changeset
pip interface plugin: fixed issues with the pip interface after they moved the index to the new site (pypi.org).
Tue, 17 Apr 2018 19:11:51 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 17 Apr 2018 19:11:51 +0200
- changeset 6253
- a148632e9610
- parent 6250
- 71b951449f33
- child 6257
- 4523c5e6dd43
pip interface plugin: fixed issues with the pip interface after they moved the index to the new site (pypi.org).
--- a/APIs/Python3/eric6.api Sun Apr 15 10:50:50 2018 +0200 +++ b/APIs/Python3/eric6.api Tue Apr 17 19:11:51 2018 +0200 @@ -4094,41 +4094,16 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.PathNode?1(name, look="circle") eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.ARITHMETIC_OP?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BENCHMARK_KEYS?7 -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.error?4(line_number, offset, text, check) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.error_args?4(line_number, offset, text, check, *args) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.get_count?4(prefix='') -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.get_file_results?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.get_statistics?4(prefix='') -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.increment_logical_line?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.init_file?4(filename, lines, expected, line_offset) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.print_benchmark?4() +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BLANK_LINES_CONFIG?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.print_filename?7 -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.print_statistics?4(prefix='') -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.start?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport.stop?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.BaseReport?1(options) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.COMMENT_WITH_NL?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.COMPARE_NEGATIVE_REGEX?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.COMPARE_SINGLETON_REGEX?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.COMPARE_TYPE_REGEX?7 -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.build_tokens_line?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.check_all?4(expected=None, line_offset=0) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.check_ast?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.check_logical?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.check_physical?4(line) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.generate_tokens?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.init_checker_state?4(name, argument_names) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.maybe_check_physical?4(token) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.readline?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.report_invalid_syntax?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker.run_check?4(check, argument_names) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.Checker?1(filename=None, lines=None, options=None, report=None, **kwargs) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DEFAULT_EXCLUDE?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DEFAULT_IGNORE?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DOCSTRING_REGEX?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DUNDER_REGEX?7 -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DiffReport.error?4(line_number, offset, text, check) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.DiffReport?1(options) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.ERRORCODE_REGEX?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.EXTRANEOUS_WHITESPACE_REGEX?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.FileReport.print_filename?7 @@ -4151,19 +4126,6 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.STARTSWITH_DEF_REGEX?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.STARTSWITH_INDENT_STATEMENT_REGEX?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.STARTSWITH_TOP_LEVEL_REGEX?7 -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StandardReport.error?4(line_number, offset, text, check) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StandardReport.error_args?4(line_number, offset, code, check, *args) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StandardReport.get_file_results?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StandardReport.init_file?4(filename, lines, expected, line_offset) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StandardReport?1(options) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StyleGuide.check_files?4(paths=None) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StyleGuide.excluded?4(filename, parent=None) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StyleGuide.get_checks?4(argument_name) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StyleGuide.ignore_code?4(code) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StyleGuide.init_report?4(reporter=None) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StyleGuide.input_dir?4(dirname) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StyleGuide.input_file?4(filename, lines=None, expected=None, line_offset=0) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.StyleGuide?1(*args, **kwargs) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.TESTSUITE_PATH?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.UNARY_OPERATORS?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.WHITESPACE?7 @@ -4171,8 +4133,10 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.WS_NEEDED_OPERATORS?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.WS_OPTIONAL_OPERATORS?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._add_check?5(check, kind, codes, args) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._break_around_binary_operators?5(tokens) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._checks?8 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._get_parameters?5(function) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._is_binary_operator?5(token_type, text) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._is_eol_token?5(token) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._is_eol_token?5(token, _eol_token=_is_eol_token) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle._main?5() @@ -4180,23 +4144,46 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.ambiguous_identifier?4(logical_line, tokens) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.bare_except?4(logical_line, noqa) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.blank_lines?4(logical_line, blank_lines, indent_level, line_number, blank_before, previous_logical, previous_unindented_logical_line, previous_indent_level, lines) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.break_around_binary_operator?4(logical_line, tokens) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.break_after_binary_operator?4(logical_line, tokens) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.break_before_binary_operator?4(logical_line, tokens) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.build_tokens_line?4(self) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.check_all?4(self, expected=None, line_offset=0) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.check_ast?4(self) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.check_files?4(self, paths=None) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.check_logical?4(self) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.check_physical?4(self, line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.comparison_negative?4(logical_line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.comparison_to_singleton?4(logical_line, noqa) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.comparison_type?4(logical_line, noqa) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.compound_statements?4(logical_line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.continued_indentation?4(logical_line, tokens, indent_level, hang_closing, indent_char, noqa, verbose) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.error?4(self, line_number, offset, text, check) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.error_args?4(self, line_number, offset, code, check, *args) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.error_args?4(self, line_number, offset, text, check, *args) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.excluded?4(self, filename, parent=None) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.expand_indent?4(line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.explicit_line_join?4(logical_line, tokens) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.extraneous_whitespace?4(logical_line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.filename_match?4(filename, patterns, default=True) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.generate_tokens?4(self) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.get_checks?4(self, argument_name) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.get_count?4(self, prefix='') +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.get_file_results?4(self) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.get_parser?4(prog='pycodestyle', version=__version__) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.get_statistics?4(self, prefix='') +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.ignore_code?4(self, code) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.imports_on_separate_lines?4(logical_line) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.increment_logical_line?4(self) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.indentation?4(logical_line, previous_logical, indent_char, indent_level, previous_indent_level) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.init_checks_registry?4() -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.is_binary_operator?4(token_type, text) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.init_checker_state?4(self, name, argument_names) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.init_file?4(self, filename, lines, expected, line_offset) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.init_report?4(self, reporter=None) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.input_dir?4(self, dirname) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.input_file?4(self, filename, lines=None, expected=None, line_offset=0) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.is_string_literal?4(line) -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.maximum_line_length?4(physical_line, max_line_length, multiline, noqa) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.lru_cache?4(maxsize=128) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.maximum_line_length?4(physical_line, max_line_length, multiline, line_number, noqa) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.maybe_check_physical?4(self, token) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.missing_whitespace?4(logical_line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.missing_whitespace_after_import_keyword?4(logical_line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.missing_whitespace_around_operator?4(logical_line, tokens) @@ -4205,15 +4192,24 @@ eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.noqa?7 eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.normalize_paths?4(value, parent=os.curdir) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.parse_udiff?4(diff, patterns=None, parent='.') -eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.process_options?4(arglist=None, parse_argv=False, config_file=None, parser=None) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.print_benchmark?4(self) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.print_statistics?4(self, prefix='') +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.process_options?4(arglist=None, parse_argv=False, config_file=None, parser=None, verbose=None) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.python_3000_async_await_keywords?4(logical_line, tokens) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.python_3000_backticks?4(logical_line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.python_3000_has_key?4(logical_line, noqa) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.python_3000_invalid_escape_sequence?4(logical_line, tokens) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.python_3000_not_equal?4(logical_line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.python_3000_raise_comma?4(logical_line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.read_config?4(options, args, arglist, parser) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.readline?4(self) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.readlines?4(filename) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.register_check?4(check, codes=None) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.report_invalid_syntax?4(self) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.run_check?4(self, check, argument_names) +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.start?4(self) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.stdin_get_value?4() +eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.stop?4(self) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.tabs_obsolete?4(physical_line) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.tabs_or_spaces?4(physical_line, indent_char) eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.trailing_blank_lines?4(physical_line, lines, line_number, total_lines) @@ -4873,6 +4869,7 @@ eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.PipPage.save?4() eric6.Plugins.UiExtensionPlugins.PipInterface.ConfigurationPage.PipPage.PipPage?1(plugin) eric6.Plugins.UiExtensionPlugins.PipInterface.DefaultIndexUrl?7 +eric6.Plugins.UiExtensionPlugins.PipInterface.DefaultPyPiUrl?7 eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.getMenu?4(name) eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.getMenuNames?4() eric6.Plugins.UiExtensionPlugins.PipInterface.Pip.Pip.initActions?4() @@ -8219,7 +8216,7 @@ eric6.QScintilla.Editor.Editor.WarningStyle?7 eric6.QScintilla.Editor.Editor.addCallTipHook?4(key, func) eric6.QScintilla.Editor.Editor.addClone?4(editor) -eric6.QScintilla.Editor.Editor.addCompletionListHook?4(key, func, async=False) +eric6.QScintilla.Editor.Editor.addCompletionListHook?4(key, func, asynchroneous=False) eric6.QScintilla.Editor.Editor.addedToProject?4() eric6.QScintilla.Editor.Editor.autoComplete?4(auto=False, context=True) eric6.QScintilla.Editor.Editor.autoCompleteQScintilla?4()
--- a/Documentation/Help/source.qhp Sun Apr 15 10:50:50 2018 +0200 +++ b/Documentation/Help/source.qhp Tue Apr 17 19:11:51 2018 +0200 @@ -2159,18 +2159,6 @@ <keyword name="BackgroundService.serviceDisconnect" id="BackgroundService.serviceDisconnect" ref="eric6.Utilities.BackgroundService.html#BackgroundService.serviceDisconnect" /> <keyword name="BackgroundService.shutdown" id="BackgroundService.shutdown" ref="eric6.Utilities.BackgroundService.html#BackgroundService.shutdown" /> <keyword name="BaseReport" id="BaseReport" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport" /> - <keyword name="BaseReport (Constructor)" id="BaseReport (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.__init__" /> - <keyword name="BaseReport.error" id="BaseReport.error" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.error" /> - <keyword name="BaseReport.error_args" id="BaseReport.error_args" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.error_args" /> - <keyword name="BaseReport.get_count" id="BaseReport.get_count" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.get_count" /> - <keyword name="BaseReport.get_file_results" id="BaseReport.get_file_results" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.get_file_results" /> - <keyword name="BaseReport.get_statistics" id="BaseReport.get_statistics" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.get_statistics" /> - <keyword name="BaseReport.increment_logical_line" id="BaseReport.increment_logical_line" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.increment_logical_line" /> - <keyword name="BaseReport.init_file" id="BaseReport.init_file" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.init_file" /> - <keyword name="BaseReport.print_benchmark" id="BaseReport.print_benchmark" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.print_benchmark" /> - <keyword name="BaseReport.print_statistics" id="BaseReport.print_statistics" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.print_statistics" /> - <keyword name="BaseReport.start" id="BaseReport.start" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.start" /> - <keyword name="BaseReport.stop" id="BaseReport.stop" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#BaseReport.stop" /> <keyword name="BaseResolver" id="BaseResolver" ref="eric6.DebugClients.Python.DebugVariables.html#BaseResolver" /> <keyword name="BaseResolver.getDictionary" id="BaseResolver.getDictionary" ref="eric6.DebugClients.Python.DebugVariables.html#BaseResolver.getDictionary" /> <keyword name="BaseResolver.resolve" id="BaseResolver.resolve" ref="eric6.DebugClients.Python.DebugVariables.html#BaseResolver.resolve" /> @@ -2822,18 +2810,6 @@ <keyword name="ChatWidget.preferencesChanged" id="ChatWidget.preferencesChanged" ref="eric6.Cooperation.ChatWidget.html#ChatWidget.preferencesChanged" /> <keyword name="ChatWidget.shutdown" id="ChatWidget.shutdown" ref="eric6.Cooperation.ChatWidget.html#ChatWidget.shutdown" /> <keyword name="Checker" id="Checker" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker" /> - <keyword name="Checker (Constructor)" id="Checker (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.__init__" /> - <keyword name="Checker.build_tokens_line" id="Checker.build_tokens_line" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.build_tokens_line" /> - <keyword name="Checker.check_all" id="Checker.check_all" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.check_all" /> - <keyword name="Checker.check_ast" id="Checker.check_ast" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.check_ast" /> - <keyword name="Checker.check_logical" id="Checker.check_logical" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.check_logical" /> - <keyword name="Checker.check_physical" id="Checker.check_physical" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.check_physical" /> - <keyword name="Checker.generate_tokens" id="Checker.generate_tokens" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.generate_tokens" /> - <keyword name="Checker.init_checker_state" id="Checker.init_checker_state" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.init_checker_state" /> - <keyword name="Checker.maybe_check_physical" id="Checker.maybe_check_physical" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.maybe_check_physical" /> - <keyword name="Checker.readline" id="Checker.readline" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.readline" /> - <keyword name="Checker.report_invalid_syntax" id="Checker.report_invalid_syntax" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.report_invalid_syntax" /> - <keyword name="Checker.run_check" id="Checker.run_check" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#Checker.run_check" /> <keyword name="CheckerPlugins (Package)" id="CheckerPlugins (Package)" ref="index-eric6.Plugins.CheckerPlugins.html" /> <keyword name="ChromeImporter" id="ChromeImporter" ref="eric6.Helpviewer.Bookmarks.BookmarksImporters.ChromeImporter.html#ChromeImporter" /> <keyword name="ChromeImporter" id="ChromeImporter" ref="eric6.WebBrowser.Bookmarks.BookmarksImporters.ChromeImporter.html#ChromeImporter" /> @@ -4025,8 +4001,6 @@ <keyword name="DiffHighlighter (Module)" id="DiffHighlighter (Module)" ref="eric6.UI.DiffHighlighter.html" /> <keyword name="DiffHighlighter.generateRules" id="DiffHighlighter.generateRules" ref="eric6.UI.DiffHighlighter.html#DiffHighlighter.generateRules" /> <keyword name="DiffReport" id="DiffReport" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#DiffReport" /> - <keyword name="DiffReport (Constructor)" id="DiffReport (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#DiffReport.__init__" /> - <keyword name="DiffReport.error" id="DiffReport.error" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#DiffReport.error" /> <keyword name="DiffWindow" id="DiffWindow" ref="eric6.UI.DiffDialog.html#DiffWindow" /> <keyword name="DiffWindow (Constructor)" id="DiffWindow (Constructor)" ref="eric6.UI.DiffDialog.html#DiffWindow.__init__" /> <keyword name="DiffWindow.eventFilter" id="DiffWindow.eventFilter" ref="eric6.UI.DiffDialog.html#DiffWindow.eventFilter" /> @@ -14682,11 +14656,6 @@ <keyword name="StackedWidget.setCurrentIndex" id="StackedWidget.setCurrentIndex" ref="eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.html#StackedWidget.setCurrentIndex" /> <keyword name="StackedWidget.setCurrentWidget" id="StackedWidget.setCurrentWidget" ref="eric6.Plugins.ViewManagerPlugins.Listspace.Listspace.html#StackedWidget.setCurrentWidget" /> <keyword name="StandardReport" id="StandardReport" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StandardReport" /> - <keyword name="StandardReport (Constructor)" id="StandardReport (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StandardReport.__init__" /> - <keyword name="StandardReport.error" id="StandardReport.error" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StandardReport.error" /> - <keyword name="StandardReport.error_args" id="StandardReport.error_args" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StandardReport.error_args" /> - <keyword name="StandardReport.get_file_results" id="StandardReport.get_file_results" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StandardReport.get_file_results" /> - <keyword name="StandardReport.init_file" id="StandardReport.init_file" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StandardReport.init_file" /> <keyword name="StartDialog" id="StartDialog" ref="eric6.Debugger.StartDialog.html#StartDialog" /> <keyword name="StartDialog (Constructor)" id="StartDialog (Constructor)" ref="eric6.Debugger.StartDialog.html#StartDialog.__init__" /> <keyword name="StartDialog (Module)" id="StartDialog (Module)" ref="eric6.Debugger.StartDialog.html" /> @@ -14750,14 +14719,6 @@ <keyword name="StripProjectHelper.initMenu" id="StripProjectHelper.initMenu" ref="eric6.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html#StripProjectHelper.initMenu" /> <keyword name="StripProjectHelper.menuTitle" id="StripProjectHelper.menuTitle" ref="eric6.Plugins.VcsPlugins.vcsMercurial.StripExtension.ProjectHelper.html#StripProjectHelper.menuTitle" /> <keyword name="StyleGuide" id="StyleGuide" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide" /> - <keyword name="StyleGuide (Constructor)" id="StyleGuide (Constructor)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.__init__" /> - <keyword name="StyleGuide.check_files" id="StyleGuide.check_files" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.check_files" /> - <keyword name="StyleGuide.excluded" id="StyleGuide.excluded" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.excluded" /> - <keyword name="StyleGuide.get_checks" id="StyleGuide.get_checks" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.get_checks" /> - <keyword name="StyleGuide.ignore_code" id="StyleGuide.ignore_code" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.ignore_code" /> - <keyword name="StyleGuide.init_report" id="StyleGuide.init_report" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.init_report" /> - <keyword name="StyleGuide.input_dir" id="StyleGuide.input_dir" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.input_dir" /> - <keyword name="StyleGuide.input_file" id="StyleGuide.input_file" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#StyleGuide.input_file" /> <keyword name="Subversion" id="Subversion" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion" /> <keyword name="Subversion" id="Subversion" ref="eric6.Plugins.VcsPlugins.vcsSubversion.subversion.html#Subversion" /> <keyword name="Subversion (Constructor)" id="Subversion (Constructor)" ref="eric6.Plugins.VcsPlugins.vcsPySvn.subversion.html#Subversion.__init__" /> @@ -18335,6 +18296,11 @@ <keyword name="__getMasterPassword" id="__getMasterPassword" ref="eric6.Utilities.crypto.__init__.html#__getMasterPassword" /> <keyword name="__getPygmentsLexer" id="__getPygmentsLexer" ref="eric6.QScintilla.Lexers.__init__.html#__getPygmentsLexer" /> <keyword name="__initChannelModesDict" id="__initChannelModesDict" ref="eric6.Network.IRC.IrcUtilities.html#__initChannelModesDict" /> + <keyword name="__init__" id="__init__" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#__init__" /> + <keyword name="__init___1" id="__init___1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#__init___1" /> + <keyword name="__init___2" id="__init___2" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#__init___2" /> + <keyword name="__init___3" id="__init___3" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#__init___3" /> + <keyword name="__init___4" id="__init___4" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#__init___4" /> <keyword name="__jsSyntaxCheck" id="__jsSyntaxCheck" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html#__jsSyntaxCheck" /> <keyword name="__messageBox" id="__messageBox" ref="eric6.E5Gui.E5MessageBox.html#__messageBox" /> <keyword name="__pyName" id="__pyName" ref="eric6.Utilities.uic.html#__pyName" /> @@ -18349,6 +18315,7 @@ <keyword name="__showwarning" id="__showwarning" ref="eric6.Utilities.__init__.html#__showwarning" /> <keyword name="__syntaxAndPyflakesCheck" id="__syntaxAndPyflakesCheck" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html#__syntaxAndPyflakesCheck" /> <keyword name="_add_check" id="_add_check" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_add_check" /> + <keyword name="_break_around_binary_operators" id="_break_around_binary_operators" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_break_around_binary_operators" /> <keyword name="_buildChildrenLists" id="_buildChildrenLists" ref="eric6.Graphics.GraphicsUtilities.html#_buildChildrenLists" /> <keyword name="_encode_base64" id="_encode_base64" ref="eric6.UI.EmailDialog.html#_encode_base64" /> <keyword name="_findDefaultExecutables" id="_findDefaultExecutables" ref="eric6.Plugins.PluginPipInterface.html#_findDefaultExecutables" /> @@ -18357,6 +18324,7 @@ <keyword name="_indent" id="_indent" ref="eric6.Utilities.ClassBrowsers.pyclbr.html#_indent" /> <keyword name="_indent" id="_indent" ref="eric6.Utilities.ModuleParser.html#_indent" /> <keyword name="_initTypeMap" id="_initTypeMap" ref="eric6.DebugClients.Python.DebugVariables.html#_initTypeMap" /> + <keyword name="_is_binary_operator" id="_is_binary_operator" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_is_binary_operator" /> <keyword name="_is_eol_token" id="_is_eol_token" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_is_eol_token" /> <keyword name="_is_eol_token_1" id="_is_eol_token_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_is_eol_token_1" /> <keyword name="_main" id="_main" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#_main" /> @@ -18377,11 +18345,18 @@ <keyword name="batchCheck" id="batchCheck" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#batchCheck" /> <keyword name="binplistlib (Module)" id="binplistlib (Module)" ref="eric6.Utilities.binplistlib.html" /> <keyword name="blank_lines" id="blank_lines" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#blank_lines" /> - <keyword name="break_around_binary_operator" id="break_around_binary_operator" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#break_around_binary_operator" /> + <keyword name="break_after_binary_operator" id="break_after_binary_operator" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#break_after_binary_operator" /> + <keyword name="break_before_binary_operator" id="break_before_binary_operator" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#break_before_binary_operator" /> + <keyword name="build_tokens_line" id="build_tokens_line" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#build_tokens_line" /> <keyword name="changeRememberedMaster" id="changeRememberedMaster" ref="eric6.Utilities.crypto.__init__.html#changeRememberedMaster" /> <keyword name="check" id="check" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#check" /> <keyword name="checkBlacklistedVersions" id="checkBlacklistedVersions" ref="eric6.Globals.__init__.html#checkBlacklistedVersions" /> <keyword name="checkPyside" id="checkPyside" ref="eric6.Utilities.__init__.html#checkPyside" /> + <keyword name="check_all" id="check_all" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#check_all" /> + <keyword name="check_ast" id="check_ast" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#check_ast" /> + <keyword name="check_files" id="check_files" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#check_files" /> + <keyword name="check_logical" id="check_logical" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#check_logical" /> + <keyword name="check_physical" id="check_physical" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#check_physical" /> <keyword name="cleanUp" id="cleanUp" ref="eric6.install-debugclients.html#cleanUp" /> <keyword name="cleanUp" id="cleanUp" ref="eric6.install.html#cleanUp" /> <keyword name="cleanupSource" id="cleanupSource" ref="eric6.cleanupSource.html#cleanupSource" /> @@ -18575,9 +18550,15 @@ <keyword name="eric6_webbrowser (Module)" id="eric6_webbrowser (Module)" ref="eric6.eric6_webbrowser.html" /> <keyword name="eric6config (Module)" id="eric6config (Module)" ref="eric6.eric6config.html" /> <keyword name="eric6dbgstub (Module)" id="eric6dbgstub (Module)" ref="eric6.DebugClients.Python.eric6dbgstub.html" /> + <keyword name="error" id="error" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#error" /> + <keyword name="error_1" id="error_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#error_1" /> + <keyword name="error_2" id="error_2" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#error_2" /> + <keyword name="error_args" id="error_args" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#error_args" /> + <keyword name="error_args_1" id="error_args_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#error_args_1" /> <keyword name="escape_entities" id="escape_entities" ref="eric6.Utilities.__init__.html#escape_entities" /> <keyword name="escape_uentities" id="escape_uentities" ref="eric6.Utilities.__init__.html#escape_uentities" /> <keyword name="excepthook" id="excepthook" ref="eric6.eric6.html#excepthook" /> + <keyword name="excluded" id="excluded" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#excluded" /> <keyword name="exeDisplayData" id="exeDisplayData" ref="eric6.Plugins.PluginEricapi.html#exeDisplayData" /> <keyword name="exeDisplayData" id="exeDisplayData" ref="eric6.Plugins.PluginVcsGit.html#exeDisplayData" /> <keyword name="exeDisplayData" id="exeDisplayData" ref="eric6.Plugins.PluginVcsMercurial.html#exeDisplayData" /> @@ -18622,6 +18603,7 @@ <keyword name="generatePySideToolPath" id="generatePySideToolPath" ref="eric6.Utilities.__init__.html#generatePySideToolPath" /> <keyword name="generateQtToolName" id="generateQtToolName" ref="eric6.Utilities.__init__.html#generateQtToolName" /> <keyword name="generateVersionInfo" id="generateVersionInfo" ref="eric6.Utilities.__init__.html#generateVersionInfo" /> + <keyword name="generate_tokens" id="generate_tokens" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#generate_tokens" /> <keyword name="getAllImages" id="getAllImages" ref="eric6.WebBrowser.Tools.Scripts.html#getAllImages" /> <keyword name="getAllMetaAttributes" id="getAllMetaAttributes" ref="eric6.WebBrowser.Tools.Scripts.html#getAllMetaAttributes" /> <keyword name="getBasicHelper" id="getBasicHelper" ref="eric6.VCS.__init__.html#getBasicHelper" /> @@ -18770,10 +18752,15 @@ <keyword name="getWebBrowser" id="getWebBrowser" ref="eric6.Preferences.__init__.html#getWebBrowser" /> <keyword name="getWebEngineVersions" id="getWebEngineVersions" ref="eric6.WebBrowser.Tools.WebBrowserTools.html#getWebEngineVersions" /> <keyword name="getWindowsExecutablePath" id="getWindowsExecutablePath" ref="eric6.Utilities.__init__.html#getWindowsExecutablePath" /> + <keyword name="get_checks" id="get_checks" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#get_checks" /> <keyword name="get_class_members" id="get_class_members" ref="eric6.DebugClients.Python.FlexCompleter.html#get_class_members" /> <keyword name="get_coding" id="get_coding" ref="eric6.Utilities.__init__.html#get_coding" /> <keyword name="get_codingBytes" id="get_codingBytes" ref="eric6.Utilities.__init__.html#get_codingBytes" /> + <keyword name="get_count" id="get_count" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#get_count" /> + <keyword name="get_file_results" id="get_file_results" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#get_file_results" /> + <keyword name="get_file_results_1" id="get_file_results_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#get_file_results_1" /> <keyword name="get_parser" id="get_parser" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#get_parser" /> + <keyword name="get_statistics" id="get_statistics" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#get_statistics" /> <keyword name="getargvalues" id="getargvalues" ref="eric6.DebugClients.Python.DebugUtilities.html#getargvalues" /> <keyword name="getpass" id="getpass" ref="eric6.DebugClients.Python.getpass.html#getpass" /> <keyword name="getpass (Module)" id="getpass (Module)" ref="eric6.DebugClients.Python.getpass.html" /> @@ -18793,9 +18780,11 @@ <keyword name="html_uencode" id="html_uencode" ref="eric6.Utilities.__init__.html#html_uencode" /> <keyword name="idlclbr (Module)" id="idlclbr (Module)" ref="eric6.Utilities.ClassBrowsers.idlclbr.html" /> <keyword name="ignoreCode" id="ignoreCode" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#ignoreCode" /> + <keyword name="ignore_code" id="ignore_code" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#ignore_code" /> <keyword name="importPreferences" id="importPreferences" ref="eric6.Preferences.__init__.html#importPreferences" /> <keyword name="importShortcuts" id="importShortcuts" ref="eric6.Preferences.Shortcuts.html#importShortcuts" /> <keyword name="imports_on_separate_lines" id="imports_on_separate_lines" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#imports_on_separate_lines" /> + <keyword name="increment_logical_line" id="increment_logical_line" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#increment_logical_line" /> <keyword name="indentation" id="indentation" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#indentation" /> <keyword name="information" id="information" ref="eric6.E5Gui.E5MessageBox.html#information" /> <keyword name="initBatchService" id="initBatchService" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleChecker.html#initBatchService" /> @@ -18815,8 +18804,13 @@ <keyword name="initService" id="initService" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.SyntaxCheck.html#initService" /> <keyword name="initService" id="initService" ref="eric6.Plugins.CheckerPlugins.SyntaxChecker.jsCheckSyntax.html#initService" /> <keyword name="initService" id="initService" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#initService" /> - <keyword name="init_checks_registry" id="init_checks_registry" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#init_checks_registry" /> + <keyword name="init_checker_state" id="init_checker_state" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#init_checker_state" /> + <keyword name="init_file" id="init_file" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#init_file" /> + <keyword name="init_file_1" id="init_file_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#init_file_1" /> + <keyword name="init_report" id="init_report" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#init_report" /> <keyword name="initializeResourceSearchPath" id="initializeResourceSearchPath" ref="eric6.Toolbox.Startup.html#initializeResourceSearchPath" /> + <keyword name="input_dir" id="input_dir" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#input_dir" /> + <keyword name="input_file" id="input_file" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#input_file" /> <keyword name="install (Module)" id="install (Module)" ref="eric6.install.html" /> <keyword name="install-debugclients (Module)" id="install-debugclients (Module)" ref="eric6.install-debugclients.html" /> <keyword name="install-i18n (Module)" id="install-i18n (Module)" ref="eric6.install-i18n.html" /> @@ -18839,7 +18833,6 @@ <keyword name="isValidIPv4Address" id="isValidIPv4Address" ref="eric6.E5Network.__init__.html#isValidIPv4Address" /> <keyword name="isValidIPv6Address" id="isValidIPv6Address" ref="eric6.E5Network.__init__.html#isValidIPv6Address" /> <keyword name="isWindowsPlatform" id="isWindowsPlatform" ref="eric6.Globals.__init__.html#isWindowsPlatform" /> - <keyword name="is_binary_operator" id="is_binary_operator" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#is_binary_operator" /> <keyword name="is_stream_binary_plist" id="is_stream_binary_plist" ref="eric6.Utilities.binplistlib.html#is_stream_binary_plist" /> <keyword name="is_string_literal" id="is_string_literal" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#is_string_literal" /> <keyword name="isinpath" id="isinpath" ref="eric6.Utilities.__init__.html#isinpath" /> @@ -18854,6 +18847,7 @@ <keyword name="loadTranslatorForLocale" id="loadTranslatorForLocale" ref="eric6.Toolbox.Startup.html#loadTranslatorForLocale" /> <keyword name="loadTranslators" id="loadTranslators" ref="eric6.Toolbox.Startup.html#loadTranslators" /> <keyword name="load_sourceAsStr" id="load_sourceAsStr" ref="eric6.Globals.compatibility_fixes.html#load_sourceAsStr" /> + <keyword name="lru_cache" id="lru_cache" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#lru_cache" /> <keyword name="main" id="main" ref="eric6.Plugins.VcsPlugins.vcsMercurial.HisteditExtension.HgHisteditEditor.html#main" /> <keyword name="main" id="main" ref="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardServer.html#main" /> <keyword name="main" id="main" ref="eric6.cleanupSource.html#main" /> @@ -18890,6 +18884,7 @@ <keyword name="main" id="main" ref="eric6.uninstall.html#main" /> <keyword name="makeAppInfo" id="makeAppInfo" ref="eric6.Globals.AppInfo.html#makeAppInfo" /> <keyword name="maximum_line_length" id="maximum_line_length" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#maximum_line_length" /> + <keyword name="maybe_check_physical" id="maybe_check_physical" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#maybe_check_physical" /> <keyword name="mccabe (Module)" id="mccabe (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.mccabe.html" /> <keyword name="messageHandler" id="messageHandler" ref="eric6.E5Gui.E5ErrorMessage.html#messageHandler" /> <keyword name="messageHandlerInstalled" id="messageHandlerInstalled" ref="eric6.E5Gui.E5ErrorMessage.html#messageHandlerInstalled" /> @@ -18941,6 +18936,8 @@ <keyword name="previewPix" id="previewPix" ref="eric6.Plugins.PluginVmListspace.html#previewPix" /> <keyword name="previewPix" id="previewPix" ref="eric6.Plugins.PluginVmTabview.html#previewPix" /> <keyword name="printFile" id="printFile" ref="eric6.WebBrowser.Tools.FilePrinter.html#printFile" /> + <keyword name="print_benchmark" id="print_benchmark" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#print_benchmark" /> + <keyword name="print_statistics" id="print_statistics" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#print_statistics" /> <keyword name="printerr" id="printerr" ref="eric6.DebugClients.Python.DebugBase.html#printerr" /> <keyword name="process_options" id="process_options" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#process_options" /> <keyword name="process_tokens" id="process_tokens" ref="eric6.Plugins.CheckerPlugins.Tabnanny.Tabnanny.html#process_tokens" /> @@ -18959,8 +18956,10 @@ <keyword name="py3PBKDF2 (Module)" id="py3PBKDF2 (Module)" ref="eric6.Utilities.crypto.py3PBKDF2.html" /> <keyword name="pyclbr (Module)" id="pyclbr (Module)" ref="eric6.Utilities.ClassBrowsers.pyclbr.html" /> <keyword name="pycodestyle (Module)" id="pycodestyle (Module)" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html" /> + <keyword name="python_3000_async_await_keywords" id="python_3000_async_await_keywords" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#python_3000_async_await_keywords" /> <keyword name="python_3000_backticks" id="python_3000_backticks" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#python_3000_backticks" /> <keyword name="python_3000_has_key" id="python_3000_has_key" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#python_3000_has_key" /> + <keyword name="python_3000_invalid_escape_sequence" id="python_3000_invalid_escape_sequence" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#python_3000_invalid_escape_sequence" /> <keyword name="python_3000_not_equal" id="python_3000_not_equal" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#python_3000_not_equal" /> <keyword name="python_3000_raise_comma" id="python_3000_raise_comma" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#python_3000_raise_comma" /> <keyword name="qVersionTuple" id="qVersionTuple" ref="eric6.Globals.__init__.html#qVersionTuple" /> @@ -18981,6 +18980,7 @@ <keyword name="readStringFromStream" id="readStringFromStream" ref="eric6.Utilities.__init__.html#readStringFromStream" /> <keyword name="readToolGroups" id="readToolGroups" ref="eric6.Preferences.__init__.html#readToolGroups" /> <keyword name="read_config" id="read_config" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#read_config" /> + <keyword name="readline" id="readline" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#readline" /> <keyword name="readlines" id="readlines" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#readlines" /> <keyword name="readlines_1" id="readlines_1" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#readlines_1" /> <keyword name="readmodule" id="readmodule" ref="eric6.Utilities.ClassBrowsers.__init__.html#readmodule" /> @@ -19004,10 +19004,12 @@ <keyword name="removeProjectBrowserFlags" id="removeProjectBrowserFlags" ref="eric6.Preferences.__init__.html#removeProjectBrowserFlags" /> <keyword name="renderTabPreview" id="renderTabPreview" ref="eric6.Helpviewer.HelpSnap.html#renderTabPreview" /> <keyword name="renderTabPreview" id="renderTabPreview" ref="eric6.WebBrowser.WebBrowserSnap.html#renderTabPreview" /> + <keyword name="report_invalid_syntax" id="report_invalid_syntax" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#report_invalid_syntax" /> <keyword name="resetLayout" id="resetLayout" ref="eric6.Preferences.__init__.html#resetLayout" /> <keyword name="resetParsedModule" id="resetParsedModule" ref="eric6.Utilities.ModuleParser.html#resetParsedModule" /> <keyword name="resetParsedModules" id="resetParsedModules" ref="eric6.Utilities.ModuleParser.html#resetParsedModules" /> <keyword name="retryAbort" id="retryAbort" ref="eric6.E5Gui.E5MessageBox.html#retryAbort" /> + <keyword name="run_check" id="run_check" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#run_check" /> <keyword name="runcall" id="runcall" ref="eric6.DebugClients.Python.eric6dbgstub.html#runcall" /> <keyword name="rxExecute" id="rxExecute" ref="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardServer.html#rxExecute" /> <keyword name="rxValidate" id="rxValidate" ref="eric6.Plugins.WizardPlugins.QRegularExpressionWizard.QRegularExpressionWizardServer.html#rxValidate" /> @@ -19082,9 +19084,11 @@ <keyword name="sort" id="sort" ref="eric6.Graphics.GraphicsUtilities.html#sort" /> <keyword name="speedString" id="speedString" ref="eric6.WebBrowser.Download.DownloadUtilities.html#speedString" /> <keyword name="splitPath" id="splitPath" ref="eric6.Utilities.__init__.html#splitPath" /> + <keyword name="start" id="start" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#start" /> <keyword name="startDebugger" id="startDebugger" ref="eric6.DebugClients.Python.eric6dbgstub.html#startDebugger" /> <keyword name="startswithPath" id="startswithPath" ref="eric6.Utilities.__init__.html#startswithPath" /> <keyword name="stdin_get_value" id="stdin_get_value" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#stdin_get_value" /> + <keyword name="stop" id="stop" ref="eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html#stop" /> <keyword name="strGroup" id="strGroup" ref="eric6.Globals.__init__.html#strGroup" /> <keyword name="strToQByteArray" id="strToQByteArray" ref="eric6.Globals.__init__.html#strToQByteArray" /> <keyword name="strToQByteArray" id="strToQByteArray" ref="eric6.Plugins.VcsPlugins.vcsGit.GitUtilities.html#strToQByteArray" />
--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html Sun Apr 15 10:50:50 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.pycodestyle.html Tue Apr 17 19:11:51 2018 +0200 @@ -23,7 +23,7 @@ <h3>Global Attributes</h3> <table> -<tr><td>ARITHMETIC_OP</td></tr><tr><td>BENCHMARK_KEYS</td></tr><tr><td>COMMENT_WITH_NL</td></tr><tr><td>COMPARE_NEGATIVE_REGEX</td></tr><tr><td>COMPARE_SINGLETON_REGEX</td></tr><tr><td>COMPARE_TYPE_REGEX</td></tr><tr><td>DEFAULT_EXCLUDE</td></tr><tr><td>DEFAULT_IGNORE</td></tr><tr><td>DOCSTRING_REGEX</td></tr><tr><td>DUNDER_REGEX</td></tr><tr><td>ERRORCODE_REGEX</td></tr><tr><td>EXTRANEOUS_WHITESPACE_REGEX</td></tr><tr><td>HUNK_REGEX</td></tr><tr><td>INDENT_REGEX</td></tr><tr><td>KEYWORDS</td></tr><tr><td>KEYWORD_REGEX</td></tr><tr><td>LAMBDA_REGEX</td></tr><tr><td>MAX_LINE_LENGTH</td></tr><tr><td>NEWLINE</td></tr><tr><td>OPERATOR_REGEX</td></tr><tr><td>PROJECT_CONFIG</td></tr><tr><td>PyCF_ONLY_AST</td></tr><tr><td>RAISE_COMMA_REGEX</td></tr><tr><td>REPORT_FORMAT</td></tr><tr><td>RERAISE_COMMA_REGEX</td></tr><tr><td>SINGLETONS</td></tr><tr><td>SKIP_COMMENTS</td></tr><tr><td>SKIP_TOKENS</td></tr><tr><td>STARTSWITH_DEF_REGEX</td></tr><tr><td>STARTSWITH_INDENT_STATEMENT_REGEX</td></tr><tr><td>STARTSWITH_TOP_LEVEL_REGEX</td></tr><tr><td>TESTSUITE_PATH</td></tr><tr><td>UNARY_OPERATORS</td></tr><tr><td>WHITESPACE</td></tr><tr><td>WHITESPACE_AFTER_COMMA_REGEX</td></tr><tr><td>WS_NEEDED_OPERATORS</td></tr><tr><td>WS_OPTIONAL_OPERATORS</td></tr><tr><td>__version__</td></tr><tr><td>_checks</td></tr><tr><td>noqa</td></tr> +<tr><td>ARITHMETIC_OP</td></tr><tr><td>BENCHMARK_KEYS</td></tr><tr><td>BLANK_LINES_CONFIG</td></tr><tr><td>COMMENT_WITH_NL</td></tr><tr><td>COMPARE_NEGATIVE_REGEX</td></tr><tr><td>COMPARE_SINGLETON_REGEX</td></tr><tr><td>COMPARE_TYPE_REGEX</td></tr><tr><td>DEFAULT_EXCLUDE</td></tr><tr><td>DEFAULT_IGNORE</td></tr><tr><td>DOCSTRING_REGEX</td></tr><tr><td>DUNDER_REGEX</td></tr><tr><td>ERRORCODE_REGEX</td></tr><tr><td>EXTRANEOUS_WHITESPACE_REGEX</td></tr><tr><td>HUNK_REGEX</td></tr><tr><td>INDENT_REGEX</td></tr><tr><td>KEYWORDS</td></tr><tr><td>KEYWORD_REGEX</td></tr><tr><td>LAMBDA_REGEX</td></tr><tr><td>MAX_LINE_LENGTH</td></tr><tr><td>NEWLINE</td></tr><tr><td>OPERATOR_REGEX</td></tr><tr><td>PROJECT_CONFIG</td></tr><tr><td>PyCF_ONLY_AST</td></tr><tr><td>RAISE_COMMA_REGEX</td></tr><tr><td>REPORT_FORMAT</td></tr><tr><td>RERAISE_COMMA_REGEX</td></tr><tr><td>SINGLETONS</td></tr><tr><td>SKIP_COMMENTS</td></tr><tr><td>SKIP_TOKENS</td></tr><tr><td>STARTSWITH_DEF_REGEX</td></tr><tr><td>STARTSWITH_INDENT_STATEMENT_REGEX</td></tr><tr><td>STARTSWITH_TOP_LEVEL_REGEX</td></tr><tr><td>TESTSUITE_PATH</td></tr><tr><td>UNARY_OPERATORS</td></tr><tr><td>WHITESPACE</td></tr><tr><td>WHITESPACE_AFTER_COMMA_REGEX</td></tr><tr><td>WS_NEEDED_OPERATORS</td></tr><tr><td>WS_OPTIONAL_OPERATORS</td></tr><tr><td>__version__</td></tr><tr><td>_checks</td></tr><tr><td>noqa</td></tr> </table> <h3>Classes</h3> <table> @@ -50,12 +50,33 @@ <h3>Functions</h3> <table> <tr> +<td><a href="#__init__">__init__</a></td> +<td></td> +</tr><tr> +<td><a href="#__init___1">__init__</a></td> +<td></td> +</tr><tr> +<td><a href="#__init___2">__init__</a></td> +<td></td> +</tr><tr> +<td><a href="#__init___3">__init__</a></td> +<td></td> +</tr><tr> +<td><a href="#__init___4">__init__</a></td> +<td></td> +</tr><tr> <td><a href="#_add_check">_add_check</a></td> <td></td> </tr><tr> +<td><a href="#_break_around_binary_operators">_break_around_binary_operators</a></td> +<td>Private function to reduce duplication.</td> +</tr><tr> <td><a href="#_get_parameters">_get_parameters</a></td> <td></td> </tr><tr> +<td><a href="#_is_binary_operator">_is_binary_operator</a></td> +<td></td> +</tr><tr> <td><a href="#_is_eol_token">_is_eol_token</a></td> <td></td> </tr><tr> @@ -72,14 +93,35 @@ <td>Never use the characters 'l', 'O', or 'I' as variable names.</td> </tr><tr> <td><a href="#bare_except">bare_except</a></td> -<td>When catching exceptions, mention specific exceptions whenever possible.</td> +<td>When catching exceptions, mention specific exceptions when possible.</td> </tr><tr> <td><a href="#blank_lines">blank_lines</a></td> <td>Separate top-level function and class definitions with two blank lines.</td> </tr><tr> -<td><a href="#break_around_binary_operator">break_around_binary_operator</a></td> +<td><a href="#break_after_binary_operator">break_after_binary_operator</a></td> +<td>Avoid breaks after binary operators.</td> +</tr><tr> +<td><a href="#break_before_binary_operator">break_before_binary_operator</a></td> <td>Avoid breaks before binary operators.</td> </tr><tr> +<td><a href="#build_tokens_line">build_tokens_line</a></td> +<td>Build a logical line from tokens.</td> +</tr><tr> +<td><a href="#check_all">check_all</a></td> +<td>Run all checks on the input file.</td> +</tr><tr> +<td><a href="#check_ast">check_ast</a></td> +<td>Build the file's AST and run all AST checks.</td> +</tr><tr> +<td><a href="#check_files">check_files</a></td> +<td>Run all checks on the paths.</td> +</tr><tr> +<td><a href="#check_logical">check_logical</a></td> +<td>Build a line from tokens and run all logical checks on it.</td> +</tr><tr> +<td><a href="#check_physical">check_physical</a></td> +<td>Run all physical checks on a raw input line.</td> +</tr><tr> <td><a href="#comparison_negative">comparison_negative</a></td> <td>Negative comparison should be done using "not in" and "is not".</td> </tr><tr> @@ -95,6 +137,24 @@ <td><a href="#continued_indentation">continued_indentation</a></td> <td>Continuation lines indentation.</td> </tr><tr> +<td><a href="#error">error</a></td> +<td>Report an error, according to options.</td> +</tr><tr> +<td><a href="#error_1">error</a></td> +<td>Report an error, according to options.</td> +</tr><tr> +<td><a href="#error_2">error</a></td> +<td></td> +</tr><tr> +<td><a href="#error_args">error_args</a></td> +<td>Report an error, according to options.</td> +</tr><tr> +<td><a href="#error_args_1">error_args</a></td> +<td>Report an error, according to options.</td> +</tr><tr> +<td><a href="#excluded">excluded</a></td> +<td>Check if the file should be excluded.</td> +</tr><tr> <td><a href="#expand_indent">expand_indent</a></td> <td>Return the amount of indentation.</td> </tr><tr> @@ -107,27 +167,69 @@ <td><a href="#filename_match">filename_match</a></td> <td>Check if patterns contains a pattern that matches filename.</td> </tr><tr> +<td><a href="#generate_tokens">generate_tokens</a></td> +<td>Tokenize the file, run physical line checks and yield tokens.</td> +</tr><tr> +<td><a href="#get_checks">get_checks</a></td> +<td>Get all the checks for this category.</td> +</tr><tr> +<td><a href="#get_count">get_count</a></td> +<td>Return the total count of errors and warnings.</td> +</tr><tr> +<td><a href="#get_file_results">get_file_results</a></td> +<td>Return the count of errors and warnings for this file.</td> +</tr><tr> +<td><a href="#get_file_results_1">get_file_results</a></td> +<td>Print the result and return the overall count for this file.</td> +</tr><tr> <td><a href="#get_parser">get_parser</a></td> <td>Create the parser for the program.</td> </tr><tr> +<td><a href="#get_statistics">get_statistics</a></td> +<td>Get statistics for message codes that start with the prefix.</td> +</tr><tr> +<td><a href="#ignore_code">ignore_code</a></td> +<td>Check if the error code should be ignored.</td> +</tr><tr> <td><a href="#imports_on_separate_lines">imports_on_separate_lines</a></td> <td>Place imports on separate lines.</td> </tr><tr> +<td><a href="#increment_logical_line">increment_logical_line</a></td> +<td>Signal a new logical line.</td> +</tr><tr> <td><a href="#indentation">indentation</a></td> <td>Use 4 spaces per indentation level.</td> </tr><tr> -<td><a href="#init_checks_registry">init_checks_registry</a></td> -<td>Register all globally visible functions.</td> +<td><a href="#init_checker_state">init_checker_state</a></td> +<td>Prepare custom state for the specific checker plugin.</td> +</tr><tr> +<td><a href="#init_file">init_file</a></td> +<td>Signal a new file.</td> +</tr><tr> +<td><a href="#init_file_1">init_file</a></td> +<td>Signal a new file.</td> </tr><tr> -<td><a href="#is_binary_operator">is_binary_operator</a></td> -<td></td> +<td><a href="#init_report">init_report</a></td> +<td>Initialize the report instance.</td> +</tr><tr> +<td><a href="#input_dir">input_dir</a></td> +<td>Check all files in this directory and all subdirectories.</td> +</tr><tr> +<td><a href="#input_file">input_file</a></td> +<td>Run all checks on a Python source file.</td> </tr><tr> <td><a href="#is_string_literal">is_string_literal</a></td> <td></td> </tr><tr> +<td><a href="#lru_cache">lru_cache</a></td> +<td></td> +</tr><tr> <td><a href="#maximum_line_length">maximum_line_length</a></td> <td>Limit all lines to a maximum of 79 characters.</td> </tr><tr> +<td><a href="#maybe_check_physical">maybe_check_physical</a></td> +<td>If appropriate (based on token), check current physical line(s).</td> +</tr><tr> <td><a href="#missing_whitespace">missing_whitespace</a></td> <td>Each comma, semicolon or colon should be followed by whitespace.</td> </tr><tr> @@ -149,15 +251,27 @@ <td><a href="#parse_udiff">parse_udiff</a></td> <td>Return a dictionary of matching lines.</td> </tr><tr> +<td><a href="#print_benchmark">print_benchmark</a></td> +<td>Print benchmark numbers.</td> +</tr><tr> +<td><a href="#print_statistics">print_statistics</a></td> +<td>Print overall statistics (number of errors and warnings).</td> +</tr><tr> <td><a href="#process_options">process_options</a></td> <td>Process options passed either via arglist or via command line args.</td> </tr><tr> +<td><a href="#python_3000_async_await_keywords">python_3000_async_await_keywords</a></td> +<td>'async' and 'await' are reserved keywords starting with Python 3.7</td> +</tr><tr> <td><a href="#python_3000_backticks">python_3000_backticks</a></td> <td>Use repr() instead of backticks in Python 3.</td> </tr><tr> <td><a href="#python_3000_has_key">python_3000_has_key</a></td> <td>The {}.has_key() method is removed in Python 3: use the 'in' operator.</td> </tr><tr> +<td><a href="#python_3000_invalid_escape_sequence">python_3000_invalid_escape_sequence</a></td> +<td>Invalid escape sequences are deprecated in Python 3.6.</td> +</tr><tr> <td><a href="#python_3000_not_equal">python_3000_not_equal</a></td> <td>New code should always use != instead of <>.</td> </tr><tr> @@ -167,6 +281,9 @@ <td><a href="#read_config">read_config</a></td> <td>Read and parse configurations.</td> </tr><tr> +<td><a href="#readline">readline</a></td> +<td>Get the next line from the input buffer.</td> +</tr><tr> <td><a href="#readlines">readlines</a></td> <td>Read the source code.</td> </tr><tr> @@ -176,9 +293,21 @@ <td><a href="#register_check">register_check</a></td> <td>Register a new check object.</td> </tr><tr> +<td><a href="#report_invalid_syntax">report_invalid_syntax</a></td> +<td>Check if the syntax is valid.</td> +</tr><tr> +<td><a href="#run_check">run_check</a></td> +<td>Run a check plugin.</td> +</tr><tr> +<td><a href="#start">start</a></td> +<td>Start the timer.</td> +</tr><tr> <td><a href="#stdin_get_value">stdin_get_value</a></td> <td>Read the value from stdin.</td> </tr><tr> +<td><a href="#stop">stop</a></td> +<td>Stop the timer.</td> +</tr><tr> <td><a href="#tabs_obsolete">tabs_obsolete</a></td> <td>For new projects, spaces-only are strongly recommended over tabs.</td> </tr><tr> @@ -231,112 +360,13 @@ </table> <h3>Methods</h3> <table> -<tr> -<td><a href="#BaseReport.__init__">BaseReport</a></td> -<td></td> -</tr><tr> -<td><a href="#BaseReport.error">error</a></td> -<td>Report an error, according to options.</td> -</tr><tr> -<td><a href="#BaseReport.error_args">error_args</a></td> -<td>Report an error, according to options.</td> -</tr><tr> -<td><a href="#BaseReport.get_count">get_count</a></td> -<td>Return the total count of errors and warnings.</td> -</tr><tr> -<td><a href="#BaseReport.get_file_results">get_file_results</a></td> -<td>Return the count of errors and warnings for this file.</td> -</tr><tr> -<td><a href="#BaseReport.get_statistics">get_statistics</a></td> -<td>Get statistics for message codes that start with the prefix.</td> -</tr><tr> -<td><a href="#BaseReport.increment_logical_line">increment_logical_line</a></td> -<td>Signal a new logical line.</td> -</tr><tr> -<td><a href="#BaseReport.init_file">init_file</a></td> -<td>Signal a new file.</td> -</tr><tr> -<td><a href="#BaseReport.print_benchmark">print_benchmark</a></td> -<td>Print benchmark numbers.</td> -</tr><tr> -<td><a href="#BaseReport.print_statistics">print_statistics</a></td> -<td>Print overall statistics (number of errors and warnings).</td> -</tr><tr> -<td><a href="#BaseReport.start">start</a></td> -<td>Start the timer.</td> -</tr><tr> -<td><a href="#BaseReport.stop">stop</a></td> -<td>Stop the timer.</td> -</tr> +<tr><td>None</td></tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="BaseReport.__init__" ID="BaseReport.__init__"></a> -<h4>BaseReport (Constructor)</h4> -<b>BaseReport</b>(<i>options</i>) -<a NAME="BaseReport.error" ID="BaseReport.error"></a> -<h4>BaseReport.error</h4> -<b>error</b>(<i>line_number, offset, text, check</i>) -<p> -Report an error, according to options. -</p><a NAME="BaseReport.error_args" ID="BaseReport.error_args"></a> -<h4>BaseReport.error_args</h4> -<b>error_args</b>(<i>line_number, offset, text, check, *args</i>) -<p> -Report an error, according to options. -</p><a NAME="BaseReport.get_count" ID="BaseReport.get_count"></a> -<h4>BaseReport.get_count</h4> -<b>get_count</b>(<i>prefix=''</i>) -<p> -Return the total count of errors and warnings. -</p><a NAME="BaseReport.get_file_results" ID="BaseReport.get_file_results"></a> -<h4>BaseReport.get_file_results</h4> -<b>get_file_results</b>(<i></i>) -<p> -Return the count of errors and warnings for this file. -</p><a NAME="BaseReport.get_statistics" ID="BaseReport.get_statistics"></a> -<h4>BaseReport.get_statistics</h4> -<b>get_statistics</b>(<i>prefix=''</i>) -<p> -Get statistics for message codes that start with the prefix. -</p><p> - prefix='' matches all errors and warnings - prefix='E' matches all errors - prefix='W' matches all warnings - prefix='E4' matches all errors that have to do with imports -</p><a NAME="BaseReport.increment_logical_line" ID="BaseReport.increment_logical_line"></a> -<h4>BaseReport.increment_logical_line</h4> -<b>increment_logical_line</b>(<i></i>) -<p> -Signal a new logical line. -</p><a NAME="BaseReport.init_file" ID="BaseReport.init_file"></a> -<h4>BaseReport.init_file</h4> -<b>init_file</b>(<i>filename, lines, expected, line_offset</i>) -<p> -Signal a new file. -</p><a NAME="BaseReport.print_benchmark" ID="BaseReport.print_benchmark"></a> -<h4>BaseReport.print_benchmark</h4> -<b>print_benchmark</b>(<i></i>) -<p> -Print benchmark numbers. -</p><a NAME="BaseReport.print_statistics" ID="BaseReport.print_statistics"></a> -<h4>BaseReport.print_statistics</h4> -<b>print_statistics</b>(<i>prefix=''</i>) -<p> -Print overall statistics (number of errors and warnings). -</p><a NAME="BaseReport.start" ID="BaseReport.start"></a> -<h4>BaseReport.start</h4> -<b>start</b>(<i></i>) -<p> -Start the timer. -</p><a NAME="BaseReport.stop" ID="BaseReport.stop"></a> -<h4>BaseReport.stop</h4> -<b>stop</b>(<i></i>) -<p> -Stop the timer. -</p> + <div align="right"><a href="#top">Up</a></div> <hr /><hr /> <a NAME="Checker" ID="Checker"></a> @@ -356,107 +386,13 @@ </table> <h3>Methods</h3> <table> -<tr> -<td><a href="#Checker.__init__">Checker</a></td> -<td></td> -</tr><tr> -<td><a href="#Checker.build_tokens_line">build_tokens_line</a></td> -<td>Build a logical line from tokens.</td> -</tr><tr> -<td><a href="#Checker.check_all">check_all</a></td> -<td>Run all checks on the input file.</td> -</tr><tr> -<td><a href="#Checker.check_ast">check_ast</a></td> -<td>Build the file's AST and run all AST checks.</td> -</tr><tr> -<td><a href="#Checker.check_logical">check_logical</a></td> -<td>Build a line from tokens and run all logical checks on it.</td> -</tr><tr> -<td><a href="#Checker.check_physical">check_physical</a></td> -<td>Run all physical checks on a raw input line.</td> -</tr><tr> -<td><a href="#Checker.generate_tokens">generate_tokens</a></td> -<td>Tokenize the file, run physical line checks and yield tokens.</td> -</tr><tr> -<td><a href="#Checker.init_checker_state">init_checker_state</a></td> -<td>Prepare custom state for the specific checker plugin.</td> -</tr><tr> -<td><a href="#Checker.maybe_check_physical">maybe_check_physical</a></td> -<td>If appropriate (based on token), check current physical line(s).</td> -</tr><tr> -<td><a href="#Checker.readline">readline</a></td> -<td>Get the next line from the input buffer.</td> -</tr><tr> -<td><a href="#Checker.report_invalid_syntax">report_invalid_syntax</a></td> -<td>Check if the syntax is valid.</td> -</tr><tr> -<td><a href="#Checker.run_check">run_check</a></td> -<td>Run a check plugin.</td> -</tr> +<tr><td>None</td></tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="Checker.__init__" ID="Checker.__init__"></a> -<h4>Checker (Constructor)</h4> -<b>Checker</b>(<i>filename=None, lines=None, options=None, report=None, **kwargs</i>) -<a NAME="Checker.build_tokens_line" ID="Checker.build_tokens_line"></a> -<h4>Checker.build_tokens_line</h4> -<b>build_tokens_line</b>(<i></i>) -<p> -Build a logical line from tokens. -</p><a NAME="Checker.check_all" ID="Checker.check_all"></a> -<h4>Checker.check_all</h4> -<b>check_all</b>(<i>expected=None, line_offset=0</i>) -<p> -Run all checks on the input file. -</p><a NAME="Checker.check_ast" ID="Checker.check_ast"></a> -<h4>Checker.check_ast</h4> -<b>check_ast</b>(<i></i>) -<p> -Build the file's AST and run all AST checks. -</p><a NAME="Checker.check_logical" ID="Checker.check_logical"></a> -<h4>Checker.check_logical</h4> -<b>check_logical</b>(<i></i>) -<p> -Build a line from tokens and run all logical checks on it. -</p><a NAME="Checker.check_physical" ID="Checker.check_physical"></a> -<h4>Checker.check_physical</h4> -<b>check_physical</b>(<i>line</i>) -<p> -Run all physical checks on a raw input line. -</p><a NAME="Checker.generate_tokens" ID="Checker.generate_tokens"></a> -<h4>Checker.generate_tokens</h4> -<b>generate_tokens</b>(<i></i>) -<p> -Tokenize the file, run physical line checks and yield tokens. -</p><a NAME="Checker.init_checker_state" ID="Checker.init_checker_state"></a> -<h4>Checker.init_checker_state</h4> -<b>init_checker_state</b>(<i>name, argument_names</i>) -<p> -Prepare custom state for the specific checker plugin. -</p><a NAME="Checker.maybe_check_physical" ID="Checker.maybe_check_physical"></a> -<h4>Checker.maybe_check_physical</h4> -<b>maybe_check_physical</b>(<i>token</i>) -<p> -If appropriate (based on token), check current physical line(s). -</p><a NAME="Checker.readline" ID="Checker.readline"></a> -<h4>Checker.readline</h4> -<b>readline</b>(<i></i>) -<p> -Get the next line from the input buffer. -</p><a NAME="Checker.report_invalid_syntax" ID="Checker.report_invalid_syntax"></a> -<h4>Checker.report_invalid_syntax</h4> -<b>report_invalid_syntax</b>(<i></i>) -<p> -Check if the syntax is valid. -</p><a NAME="Checker.run_check" ID="Checker.run_check"></a> -<h4>Checker.run_check</h4> -<b>run_check</b>(<i>check, argument_names</i>) -<p> -Run a check plugin. -</p> + <div align="right"><a href="#top">Up</a></div> <hr /><hr /> <a NAME="DiffReport" ID="DiffReport"></a> @@ -476,24 +412,12 @@ </table> <h3>Methods</h3> <table> -<tr> -<td><a href="#DiffReport.__init__">DiffReport</a></td> -<td></td> -</tr><tr> -<td><a href="#DiffReport.error">error</a></td> -<td></td> -</tr> +<tr><td>None</td></tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="DiffReport.__init__" ID="DiffReport.__init__"></a> -<h4>DiffReport (Constructor)</h4> -<b>DiffReport</b>(<i>options</i>) -<a NAME="DiffReport.error" ID="DiffReport.error"></a> -<h4>DiffReport.error</h4> -<b>error</b>(<i>line_number, offset, text, check</i>) <div align="right"><a href="#top">Up</a></div> <hr /><hr /> @@ -540,51 +464,13 @@ </table> <h3>Methods</h3> <table> -<tr> -<td><a href="#StandardReport.__init__">StandardReport</a></td> -<td></td> -</tr><tr> -<td><a href="#StandardReport.error">error</a></td> -<td>Report an error, according to options.</td> -</tr><tr> -<td><a href="#StandardReport.error_args">error_args</a></td> -<td>Report an error, according to options.</td> -</tr><tr> -<td><a href="#StandardReport.get_file_results">get_file_results</a></td> -<td>Print the result and return the overall count for this file.</td> -</tr><tr> -<td><a href="#StandardReport.init_file">init_file</a></td> -<td>Signal a new file.</td> -</tr> +<tr><td>None</td></tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="StandardReport.__init__" ID="StandardReport.__init__"></a> -<h4>StandardReport (Constructor)</h4> -<b>StandardReport</b>(<i>options</i>) -<a NAME="StandardReport.error" ID="StandardReport.error"></a> -<h4>StandardReport.error</h4> -<b>error</b>(<i>line_number, offset, text, check</i>) -<p> -Report an error, according to options. -</p><a NAME="StandardReport.error_args" ID="StandardReport.error_args"></a> -<h4>StandardReport.error_args</h4> -<b>error_args</b>(<i>line_number, offset, code, check, *args</i>) -<p> -Report an error, according to options. -</p><a NAME="StandardReport.get_file_results" ID="StandardReport.get_file_results"></a> -<h4>StandardReport.get_file_results</h4> -<b>get_file_results</b>(<i></i>) -<p> -Print the result and return the overall count for this file. -</p><a NAME="StandardReport.init_file" ID="StandardReport.init_file"></a> -<h4>StandardReport.init_file</h4> -<b>init_file</b>(<i>filename, lines, expected, line_offset</i>) -<p> -Signal a new file. -</p> + <div align="right"><a href="#top">Up</a></div> <hr /><hr /> <a NAME="StyleGuide" ID="StyleGuide"></a> @@ -604,84 +490,43 @@ </table> <h3>Methods</h3> <table> -<tr> -<td><a href="#StyleGuide.__init__">StyleGuide</a></td> -<td></td> -</tr><tr> -<td><a href="#StyleGuide.check_files">check_files</a></td> -<td>Run all checks on the paths.</td> -</tr><tr> -<td><a href="#StyleGuide.excluded">excluded</a></td> -<td>Check if the file should be excluded.</td> -</tr><tr> -<td><a href="#StyleGuide.get_checks">get_checks</a></td> -<td>Get all the checks for this category.</td> -</tr><tr> -<td><a href="#StyleGuide.ignore_code">ignore_code</a></td> -<td>Check if the error code should be ignored.</td> -</tr><tr> -<td><a href="#StyleGuide.init_report">init_report</a></td> -<td>Initialize the report instance.</td> -</tr><tr> -<td><a href="#StyleGuide.input_dir">input_dir</a></td> -<td>Check all files in this directory and all subdirectories.</td> -</tr><tr> -<td><a href="#StyleGuide.input_file">input_file</a></td> -<td>Run all checks on a Python source file.</td> -</tr> +<tr><td>None</td></tr> </table> <h3>Static Methods</h3> <table> <tr><td>None</td></tr> </table> -<a NAME="StyleGuide.__init__" ID="StyleGuide.__init__"></a> -<h4>StyleGuide (Constructor)</h4> -<b>StyleGuide</b>(<i>*args, **kwargs</i>) -<a NAME="StyleGuide.check_files" ID="StyleGuide.check_files"></a> -<h4>StyleGuide.check_files</h4> -<b>check_files</b>(<i>paths=None</i>) -<p> -Run all checks on the paths. -</p><a NAME="StyleGuide.excluded" ID="StyleGuide.excluded"></a> -<h4>StyleGuide.excluded</h4> -<b>excluded</b>(<i>filename, parent=None</i>) -<p> -Check if the file should be excluded. -</p><p> - Check if 'options.exclude' contains a pattern that matches filename. -</p><a NAME="StyleGuide.get_checks" ID="StyleGuide.get_checks"></a> -<h4>StyleGuide.get_checks</h4> -<b>get_checks</b>(<i>argument_name</i>) -<p> -Get all the checks for this category. -</p><p> - Find all globally visible functions where the first argument name - starts with argument_name and which contain selected tests. -</p><a NAME="StyleGuide.ignore_code" ID="StyleGuide.ignore_code"></a> -<h4>StyleGuide.ignore_code</h4> -<b>ignore_code</b>(<i>code</i>) -<p> -Check if the error code should be ignored. -</p><p> - If 'options.select' contains a prefix of the error code, - return False. Else, if 'options.ignore' contains a prefix of - the error code, return True. -</p><a NAME="StyleGuide.init_report" ID="StyleGuide.init_report"></a> -<h4>StyleGuide.init_report</h4> -<b>init_report</b>(<i>reporter=None</i>) -<p> -Initialize the report instance. -</p><a NAME="StyleGuide.input_dir" ID="StyleGuide.input_dir"></a> -<h4>StyleGuide.input_dir</h4> -<b>input_dir</b>(<i>dirname</i>) -<p> -Check all files in this directory and all subdirectories. -</p><a NAME="StyleGuide.input_file" ID="StyleGuide.input_file"></a> -<h4>StyleGuide.input_file</h4> -<b>input_file</b>(<i>filename, lines=None, expected=None, line_offset=0</i>) -<p> -Run all checks on a Python source file. -</p> + +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="__init__" ID="__init__"></a> +<h2>__init__</h2> +<b>__init__</b>(<i>self, filename=None, lines=None, options=None, report=None, **kwargs</i>) + +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="__init___1" ID="__init___1"></a> +<h2>__init__</h2> +<b>__init__</b>(<i>self, options</i>) + +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="__init___2" ID="__init___2"></a> +<h2>__init__</h2> +<b>__init__</b>(<i>self, options</i>) + +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="__init___3" ID="__init___3"></a> +<h2>__init__</h2> +<b>__init__</b>(<i>self, options</i>) + +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="__init___4" ID="__init___4"></a> +<h2>__init__</h2> +<b>__init__</b>(<i>self, *args, **kwargs</i>) + <div align="right"><a href="#top">Up</a></div> <hr /><hr /> <a NAME="_add_check" ID="_add_check"></a> @@ -690,12 +535,30 @@ <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="_break_around_binary_operators" ID="_break_around_binary_operators"></a> +<h2>_break_around_binary_operators</h2> +<b>_break_around_binary_operators</b>(<i>tokens</i>) +<p> +Private function to reduce duplication. +</p><p> + This factors out the shared details between + :func:`break_before_binary_operator` and + :func:`break_after_binary_operator`. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="_get_parameters" ID="_get_parameters"></a> <h2>_get_parameters</h2> <b>_get_parameters</b>(<i>function</i>) <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="_is_binary_operator" ID="_is_binary_operator"></a> +<h2>_is_binary_operator</h2> +<b>_is_binary_operator</b>(<i>token_type, text</i>) + +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="_is_eol_token" ID="_is_eol_token"></a> <h2>_is_eol_token</h2> <b>_is_eol_token</b>(<i>token</i>) @@ -766,7 +629,7 @@ <h2>bare_except</h2> <b>bare_except</b>(<i>logical_line, noqa</i>) <p> -When catching exceptions, mention specific exceptions whenever possible. +When catching exceptions, mention specific exceptions when possible. </p><p> Okay: except Exception: Okay: except BaseException: @@ -805,9 +668,35 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="break_around_binary_operator" ID="break_around_binary_operator"></a> -<h2>break_around_binary_operator</h2> -<b>break_around_binary_operator</b>(<i>logical_line, tokens</i>) +<a NAME="break_after_binary_operator" ID="break_after_binary_operator"></a> +<h2>break_after_binary_operator</h2> +<b>break_after_binary_operator</b>(<i>logical_line, tokens</i>) +<p> + Avoid breaks after binary operators. +</p><p> + The preferred place to break around a binary operator is before the + operator, not after it. +</p><p> + W504: (width == 0 +\n height == 0) + W504: (width == 0 and\n height == 0) + W504: var = (1 &\n ~2) +</p><p> + Okay: foo(\n -x) + Okay: foo(x\n []) + Okay: x = '''\n''' + '' + Okay: x = '' + '''\n''' + Okay: foo(x,\n -y) + Okay: foo(x, # comment\n -y) +</p><p> + The following should be W504 but unary_context is tricky with these + Okay: var = (1 /\n -2) + Okay: var = (1 +\n -1 +\n -2) +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="break_before_binary_operator" ID="break_before_binary_operator"></a> +<h2>break_before_binary_operator</h2> +<b>break_before_binary_operator</b>(<i>logical_line, tokens</i>) <p> Avoid breaks before binary operators. </p><p> @@ -816,16 +705,63 @@ </p><p> W503: (width == 0\n + height == 0) W503: (width == 0\n and height == 0) + W503: var = (1\n & ~2) + W503: var = (1\n / -2) + W503: var = (1\n + -1\n + -2) </p><p> - Okay: (width == 0 +\n height == 0) Okay: foo(\n -x) Okay: foo(x\n []) Okay: x = '''\n''' + '' Okay: foo(x,\n -y) Okay: foo(x, # comment\n -y) - Okay: var = (1 &\n ~2) - Okay: var = (1 /\n -2) - Okay: var = (1 +\n -1 +\n -2) +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="build_tokens_line" ID="build_tokens_line"></a> +<h2>build_tokens_line</h2> +<b>build_tokens_line</b>(<i>self</i>) +<p> +Build a logical line from tokens. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="check_all" ID="check_all"></a> +<h2>check_all</h2> +<b>check_all</b>(<i>self, expected=None, line_offset=0</i>) +<p> +Run all checks on the input file. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="check_ast" ID="check_ast"></a> +<h2>check_ast</h2> +<b>check_ast</b>(<i>self</i>) +<p> +Build the file's AST and run all AST checks. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="check_files" ID="check_files"></a> +<h2>check_files</h2> +<b>check_files</b>(<i>self, paths=None</i>) +<p> +Run all checks on the paths. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="check_logical" ID="check_logical"></a> +<h2>check_logical</h2> +<b>check_logical</b>(<i>self</i>) +<p> +Build a line from tokens and run all logical checks on it. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="check_physical" ID="check_physical"></a> +<h2>check_physical</h2> +<b>check_physical</b>(<i>self, line</i>) +<p> +Run all physical checks on a raw input line. </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> @@ -953,6 +889,54 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="error" ID="error"></a> +<h2>error</h2> +<b>error</b>(<i>self, line_number, offset, text, check</i>) +<p> +Report an error, according to options. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="error_1" ID="error_1"></a> +<h2>error</h2> +<b>error</b>(<i>self, line_number, offset, text, check</i>) +<p> +Report an error, according to options. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="error_2" ID="error_2"></a> +<h2>error</h2> +<b>error</b>(<i>self, line_number, offset, text, check</i>) + +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="error_args" ID="error_args"></a> +<h2>error_args</h2> +<b>error_args</b>(<i>self, line_number, offset, text, check, *args</i>) +<p> +Report an error, according to options. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="error_args_1" ID="error_args_1"></a> +<h2>error_args</h2> +<b>error_args</b>(<i>self, line_number, offset, code, check, *args</i>) +<p> +Report an error, according to options. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="excluded" ID="excluded"></a> +<h2>excluded</h2> +<b>excluded</b>(<i>self, filename, parent=None</i>) +<p> +Check if the file should be excluded. +</p><p> + Check if 'options.exclude' contains a pattern that matches filename. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="expand_indent" ID="expand_indent"></a> <h2>expand_indent</h2> <b>expand_indent</b>(<i>line</i>) @@ -1027,6 +1011,49 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="generate_tokens" ID="generate_tokens"></a> +<h2>generate_tokens</h2> +<b>generate_tokens</b>(<i>self</i>) +<p> +Tokenize the file, run physical line checks and yield tokens. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="get_checks" ID="get_checks"></a> +<h2>get_checks</h2> +<b>get_checks</b>(<i>self, argument_name</i>) +<p> +Get all the checks for this category. +</p><p> + Find all globally visible functions where the first argument name + starts with argument_name and which contain selected tests. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="get_count" ID="get_count"></a> +<h2>get_count</h2> +<b>get_count</b>(<i>self, prefix=''</i>) +<p> +Return the total count of errors and warnings. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="get_file_results" ID="get_file_results"></a> +<h2>get_file_results</h2> +<b>get_file_results</b>(<i>self</i>) +<p> +Return the count of errors and warnings for this file. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="get_file_results_1" ID="get_file_results_1"></a> +<h2>get_file_results</h2> +<b>get_file_results</b>(<i>self</i>) +<p> +Print the result and return the overall count for this file. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="get_parser" ID="get_parser"></a> <h2>get_parser</h2> <b>get_parser</b>(<i>prog='pycodestyle', version=__version__</i>) @@ -1035,6 +1062,31 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="get_statistics" ID="get_statistics"></a> +<h2>get_statistics</h2> +<b>get_statistics</b>(<i>self, prefix=''</i>) +<p> +Get statistics for message codes that start with the prefix. +</p><p> + prefix='' matches all errors and warnings + prefix='E' matches all errors + prefix='W' matches all warnings + prefix='E4' matches all errors that have to do with imports +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="ignore_code" ID="ignore_code"></a> +<h2>ignore_code</h2> +<b>ignore_code</b>(<i>self, code</i>) +<p> +Check if the error code should be ignored. +</p><p> + If 'options.select' contains a prefix of the error code, + return False. Else, if 'options.ignore' contains a prefix of + the error code, return True. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="imports_on_separate_lines" ID="imports_on_separate_lines"></a> <h2>imports_on_separate_lines</h2> <b>imports_on_separate_lines</b>(<i>logical_line</i>) @@ -1052,6 +1104,14 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="increment_logical_line" ID="increment_logical_line"></a> +<h2>increment_logical_line</h2> +<b>increment_logical_line</b>(<i>self</i>) +<p> +Signal a new logical line. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="indentation" ID="indentation"></a> <h2>indentation</h2> <b>indentation</b>(<i>logical_line, previous_logical, indent_char, indent_level, previous_indent_level</i>) @@ -1076,20 +1136,52 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="init_checks_registry" ID="init_checks_registry"></a> -<h2>init_checks_registry</h2> -<b>init_checks_registry</b>(<i></i>) +<a NAME="init_checker_state" ID="init_checker_state"></a> +<h2>init_checker_state</h2> +<b>init_checker_state</b>(<i>self, name, argument_names</i>) <p> -Register all globally visible functions. -</p><p> - The first argument name is either 'physical_line' or 'logical_line'. +Prepare custom state for the specific checker plugin. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="init_file" ID="init_file"></a> +<h2>init_file</h2> +<b>init_file</b>(<i>self, filename, lines, expected, line_offset</i>) +<p> +Signal a new file. </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> -<a NAME="is_binary_operator" ID="is_binary_operator"></a> -<h2>is_binary_operator</h2> -<b>is_binary_operator</b>(<i>token_type, text</i>) - +<a NAME="init_file_1" ID="init_file_1"></a> +<h2>init_file</h2> +<b>init_file</b>(<i>self, filename, lines, expected, line_offset</i>) +<p> +Signal a new file. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="init_report" ID="init_report"></a> +<h2>init_report</h2> +<b>init_report</b>(<i>self, reporter=None</i>) +<p> +Initialize the report instance. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="input_dir" ID="input_dir"></a> +<h2>input_dir</h2> +<b>input_dir</b>(<i>self, dirname</i>) +<p> +Check all files in this directory and all subdirectories. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="input_file" ID="input_file"></a> +<h2>input_file</h2> +<b>input_file</b>(<i>self, filename, lines=None, expected=None, line_offset=0</i>) +<p> +Run all checks on a Python source file. +</p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> <a NAME="is_string_literal" ID="is_string_literal"></a> @@ -1098,9 +1190,15 @@ <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="lru_cache" ID="lru_cache"></a> +<h2>lru_cache</h2> +<b>lru_cache</b>(<i>maxsize=128</i>) + +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="maximum_line_length" ID="maximum_line_length"></a> <h2>maximum_line_length</h2> -<b>maximum_line_length</b>(<i>physical_line, max_line_length, multiline, noqa</i>) +<b>maximum_line_length</b>(<i>physical_line, max_line_length, multiline, line_number, noqa</i>) <p> Limit all lines to a maximum of 79 characters. </p><p> @@ -1115,6 +1213,14 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="maybe_check_physical" ID="maybe_check_physical"></a> +<h2>maybe_check_physical</h2> +<b>maybe_check_physical</b>(<i>self, token</i>) +<p> +If appropriate (based on token), check current physical line(s). +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="missing_whitespace" ID="missing_whitespace"></a> <h2>missing_whitespace</h2> <b>missing_whitespace</b>(<i>logical_line</i>) @@ -1238,9 +1344,25 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="print_benchmark" ID="print_benchmark"></a> +<h2>print_benchmark</h2> +<b>print_benchmark</b>(<i>self</i>) +<p> +Print benchmark numbers. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="print_statistics" ID="print_statistics"></a> +<h2>print_statistics</h2> +<b>print_statistics</b>(<i>self, prefix=''</i>) +<p> +Print overall statistics (number of errors and warnings). +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="process_options" ID="process_options"></a> <h2>process_options</h2> -<b>process_options</b>(<i>arglist=None, parse_argv=False, config_file=None, parser=None</i>) +<b>process_options</b>(<i>arglist=None, parse_argv=False, config_file=None, parser=None, verbose=None</i>) <p> Process options passed either via arglist or via command line args. </p><p> @@ -1249,6 +1371,18 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="python_3000_async_await_keywords" ID="python_3000_async_await_keywords"></a> +<h2>python_3000_async_await_keywords</h2> +<b>python_3000_async_await_keywords</b>(<i>logical_line, tokens</i>) +<p> +'async' and 'await' are reserved keywords starting with Python 3.7 +</p><p> + W606: async = 42 + W606: await = 42 + Okay: async def read_data(db):\n data = await db.fetch('SELECT ...') +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="python_3000_backticks" ID="python_3000_backticks"></a> <h2>python_3000_backticks</h2> <b>python_3000_backticks</b>(<i>logical_line</i>) @@ -1271,6 +1405,17 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="python_3000_invalid_escape_sequence" ID="python_3000_invalid_escape_sequence"></a> +<h2>python_3000_invalid_escape_sequence</h2> +<b>python_3000_invalid_escape_sequence</b>(<i>logical_line, tokens</i>) +<p> +Invalid escape sequences are deprecated in Python 3.6. +</p><p> + Okay: regex = r'\.png$' + W605: regex = '\.png$' +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="python_3000_not_equal" ID="python_3000_not_equal"></a> <h2>python_3000_not_equal</h2> <b>python_3000_not_equal</b>(<i>logical_line</i>) @@ -1312,6 +1457,14 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="readline" ID="readline"></a> +<h2>readline</h2> +<b>readline</b>(<i>self</i>) +<p> +Get the next line from the input buffer. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="readlines" ID="readlines"></a> <h2>readlines</h2> <b>readlines</b>(<i>filename</i>) @@ -1336,6 +1489,30 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="report_invalid_syntax" ID="report_invalid_syntax"></a> +<h2>report_invalid_syntax</h2> +<b>report_invalid_syntax</b>(<i>self</i>) +<p> +Check if the syntax is valid. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="run_check" ID="run_check"></a> +<h2>run_check</h2> +<b>run_check</b>(<i>self, check, argument_names</i>) +<p> +Run a check plugin. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> +<a NAME="start" ID="start"></a> +<h2>start</h2> +<b>start</b>(<i>self</i>) +<p> +Start the timer. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="stdin_get_value" ID="stdin_get_value"></a> <h2>stdin_get_value</h2> <b>stdin_get_value</b>(<i></i>) @@ -1344,6 +1521,14 @@ </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr /> +<a NAME="stop" ID="stop"></a> +<h2>stop</h2> +<b>stop</b>(<i>self</i>) +<p> +Stop the timer. +</p> +<div align="right"><a href="#top">Up</a></div> +<hr /><hr /> <a NAME="tabs_obsolete" ID="tabs_obsolete"></a> <h2>tabs_obsolete</h2> <b>tabs_obsolete</b>(<i>physical_line</i>) @@ -1445,7 +1630,8 @@ Don't use spaces around the '=' sign in function arguments. </p><p> Don't use spaces around the '=' sign when used to indicate a - keyword argument or a default parameter value. + keyword argument or a default parameter value, except when using a type + annotation. </p><p> Okay: def complex(real, imag=0.0): Okay: return magic(r=real, i=imag) @@ -1458,6 +1644,7 @@ </p><p> E251: def complex(real, imag = 0.0): E251: return magic(r = real, i = imag) + E252: def complex(real, image: float=0.0): </p> <div align="right"><a href="#top">Up</a></div> <hr /><hr />
--- a/Documentation/Source/eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackageDetailsDialog.html Sun Apr 15 10:50:50 2018 +0200 +++ b/Documentation/Source/eric6.Plugins.UiExtensionPlugins.PipInterface.PipPackageDetailsDialog.html Tue Apr 17 19:11:51 2018 +0200 @@ -120,14 +120,19 @@ <p> Private method to format the upload date. </p><dl> -<dt><i>datetime</i></dt> +<dt><i>datetime</i> (xmlrpc.DateTime or str)</dt> <dd> -upload date and time (xmlrpc.DateTime) +upload date and time </dd> </dl><dl> <dt>Returns:</dt> <dd> -formatted date string (string) +formatted date string +</dd> +</dl><dl> +<dt>Return Type:</dt> +<dd> +str </dd> </dl><a NAME="PipPackageDetailsDialog.__populateDetails" ID="PipPackageDetailsDialog.__populateDetails"></a> <h4>PipPackageDetailsDialog.__populateDetails</h4>
--- a/Documentation/Source/eric6.QScintilla.Editor.html Sun Apr 15 10:50:50 2018 +0200 +++ b/Documentation/Source/eric6.QScintilla.Editor.html Tue Apr 17 19:11:51 2018 +0200 @@ -2800,7 +2800,7 @@ </dd> </dl><a NAME="Editor.addCompletionListHook" ID="Editor.addCompletionListHook"></a> <h4>Editor.addCompletionListHook</h4> -<b>addCompletionListHook</b>(<i>key, func, async=False</i>) +<b>addCompletionListHook</b>(<i>key, func, asynchroneous=False</i>) <p> Public method to set an auto-completion list provider. </p><dl> @@ -2815,7 +2815,7 @@ the possible completions as a list of strings. and function(editor, bool, str) returning nothing in case async is True -</dd><dt><i>async</i> (bool)</dt> +</dd><dt><i>asynchroneous</i> (bool)</dt> <dd> flag indicating an asynchroneous function </dd>
--- a/Helpviewer/Bookmarks/DefaultBookmarks.xbel Sun Apr 15 10:50:50 2018 +0200 +++ b/Helpviewer/Bookmarks/DefaultBookmarks.xbel Tue Apr 17 19:11:51 2018 +0200 @@ -41,7 +41,7 @@ <bookmark href="https://www.python.org/"> <title>Python Language Website</title> </bookmark> - <bookmark href="https://pypi.python.org/pypi"> + <bookmark href="https://pypi.org/"> <title>Python Package Index: PyPI</title> </bookmark> </folder>
--- a/Helpviewer/Bookmarks/DefaultBookmarks_rc.py Sun Apr 15 10:50:50 2018 +0200 +++ b/Helpviewer/Bookmarks/DefaultBookmarks_rc.py Tue Apr 17 19:11:51 2018 +0200 @@ -2,49 +2,48 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.9.3) +# Created by: The Resource Compiler for PyQt5 (Qt v5.10.0) # # WARNING! All changes made in this file will be lost! from PyQt5 import QtCore qt_resource_data = b"\ -\x00\x00\x02\x11\ +\x00\x00\x02\x0d\ \x00\ -\x00\x09\x30\x78\x9c\xdd\x96\xdd\x6f\xda\x30\x10\xc0\xdf\xfb\x57\ -\x78\x79\x18\x9b\x26\xe2\x4d\xda\xc3\x44\x13\xd0\xf8\x98\xd4\xa9\ -\x53\x53\xd1\x69\xea\xa3\xe3\x1c\xe0\xe2\xd8\x9e\xed\x10\xf8\xef\ -\xe7\x7c\xb0\x02\xcd\x80\xb6\x79\x5a\x5e\x1c\xfb\xce\xf7\xbb\xbb\ -\x9c\xcf\x09\x06\xeb\x94\xa3\x15\x68\xc3\xa4\x08\xbd\x4f\xfe\x47\ -\x0f\x81\xa0\x32\x61\x62\x1e\x7a\x99\x9d\x75\xbf\x78\x83\xfe\x45\ -\xf0\x66\x7c\x33\xba\xbb\x8f\x26\x68\x1d\x03\x77\xf3\x62\xd8\xdf\ -\xd6\xbf\x40\xee\x09\x66\x92\x27\xa0\x51\x39\x24\xa1\x27\x64\x2d\ -\x28\x85\x96\x59\x0e\xfd\xa1\x94\xcb\x94\xe8\xa5\x41\x43\xa2\x03\ -\x5c\x2d\x3e\x2a\xc5\xb5\x18\x2d\x34\xcc\x42\x6f\x61\xad\x32\x3d\ -\x8c\x41\x33\xda\x65\x09\xf8\x6a\x63\x17\x52\x74\x95\x96\x0f\x40\ -\xad\xf1\xa5\x9e\xe3\x1d\xc8\x0e\x68\xe2\xb6\xa0\x5f\x10\xa3\x29\ -\xb3\xf0\x14\x84\xb7\xa4\xd3\xf0\x3c\xcf\x7d\xcd\x5c\xbc\x31\x11\ -\x4b\x2a\x53\x95\x59\x97\x20\xdf\xbd\x61\x01\xb9\x69\xc6\x47\x9b\ -\x5b\xfb\x4c\xfc\xb1\xec\xed\x58\xde\xb1\x6b\x9e\x18\xfe\x57\x1c\ -\x75\x18\xbf\xad\xcf\x24\x3e\xcc\x58\xb3\xf1\x66\xdb\x0d\x8e\x9f\ -\xc5\x4c\x60\x05\x5c\x2a\x57\x34\xc7\xe9\xe3\xbf\x7a\x6d\xf0\x13\ -\x49\x6b\xfe\x71\xa8\xa4\x59\x0a\xc2\x12\xeb\x2a\xba\x0d\x6e\xcc\ -\xe5\xfc\x1c\xf0\xd0\xe9\xb5\xc1\x9b\x49\x9d\xa5\xe7\x00\xbf\x15\ -\x8a\x6d\x10\x15\x27\x02\xec\x49\x64\x54\xaa\xa1\x5b\xdb\x5e\x35\ -\x51\xf7\xa1\x34\x34\x9d\xfc\xfd\x50\x47\xa5\xde\xab\xb9\xdb\x0e\ -\xc0\x99\xc8\xd6\x5d\xa2\x94\x29\x4f\x7e\xac\x65\x6e\x00\x4b\x9d\ -\x60\x4e\xdc\x49\xb4\xc7\x9d\xf9\xaa\x14\x67\xb4\xac\xaf\xf3\x0b\ -\x3b\xc0\x55\x4b\x78\x7e\x8f\x88\xca\x36\xf9\x82\x3e\xb1\x8d\xb6\ -\xea\xb3\x27\x92\x5c\x53\xae\x89\x98\x67\x64\x0e\x05\xce\xb4\xd1\ -\x38\x0a\x27\xd4\x46\xb1\x5d\x2f\x8a\xf9\x49\x4f\x22\x42\x97\x85\ -\x23\x57\x22\x81\x75\x0f\x45\x9b\xe8\xea\x85\xc9\x3e\x98\x1d\xa4\ -\x7d\x03\xe6\xd8\xcd\xf6\x03\x44\xf6\x9f\x5f\x6d\x9f\x5f\xc7\x7f\ -\x20\x2b\x62\xa8\x66\xca\xf6\xb8\xac\x8e\x85\x5f\x4a\x3a\x29\x61\ -\xdc\xca\xde\x60\xfa\x73\xf8\x7d\x32\xba\x0b\x3b\xe8\x03\x4a\xea\ -\xf6\xec\x97\x24\xb7\xd0\x79\x4b\x52\x75\x39\xbc\x19\xdf\x97\x72\ -\x30\x94\x28\x78\xb7\x67\xe9\xfd\x65\xb3\xf3\x53\x10\x09\xba\x66\ -\x62\x79\xd2\xef\xc7\x12\x08\x70\xf5\xe3\xf3\x07\x41\xbe\xa1\x20\ -\ +\x00\x09\x25\x78\x9c\xdd\x96\x5f\x6f\xda\x30\x10\xc0\xdf\xfb\x29\ +\xbc\x3c\x8c\x4d\x13\xf1\x26\xed\x61\xa2\x01\x34\xfe\x4c\xea\xd4\ +\xa9\xa9\xe8\x34\xf5\xd1\x71\x8e\xe0\xe2\xd8\x9e\xed\x00\xf9\xf6\ +\x33\x49\x58\x81\x66\x90\xb6\x79\x5a\x5e\x1c\xfb\xce\xf7\xbb\xbb\ +\x9c\xcf\x09\x86\x9b\x94\xa3\x15\x68\xc3\xa4\xe8\x7b\x9f\xfc\x8f\ +\x1e\x02\x41\x65\xcc\x44\xd2\xf7\x32\x3b\xef\x7e\xf1\x86\x83\x8b\ +\xe0\xcd\xe4\x66\x7c\x77\x1f\x4e\xd1\x26\x02\xee\xe6\xdb\xe1\x70\ +\xdb\xe0\x02\xb9\x27\x98\x4b\x1e\x83\x46\xc5\x10\xf7\x3d\x21\x2b\ +\x41\x21\xb4\xcc\x72\x18\x8c\xa4\x5c\xa6\x44\x2f\x0d\x1a\x11\x1d\ +\xe0\x72\xf1\x51\x29\xaa\xc4\x68\xa1\x61\xde\xf7\x16\xd6\x2a\xd3\ +\xc3\x18\x34\xa3\x5d\x16\x83\xaf\x72\xbb\x90\xa2\xab\xb4\x7c\x00\ +\x6a\x8d\x2f\x75\x82\xf7\x20\x7b\xa0\xa9\xdb\x82\x7e\x41\x84\x66\ +\xcc\xc2\x53\x10\xde\x91\xce\xc3\xd7\xeb\xb5\xaf\x99\x8b\x37\x22\ +\x62\x49\x65\xaa\x32\xeb\x12\xe4\xbb\x37\x2c\x60\x6d\xea\xf1\x61\ +\x7e\x6b\x9f\x89\x3f\x95\xbd\x3d\xcb\x7b\x76\xcd\x13\xc3\xff\x8a\ +\xa3\x0a\xe3\xb7\xf5\x99\xc4\xc7\x19\xab\x37\x5e\x6f\xbb\xc6\xf1\ +\x46\xcc\x18\x56\xc0\xa5\x72\x45\x73\x9a\x3e\xf9\xab\xd7\x06\x3f\ +\x96\xb4\xe2\x9f\x86\x4a\x9a\xa5\x20\x2c\xb1\xae\xa2\xdb\xe0\x46\ +\x5c\x26\x4d\xc0\x23\xa7\xd7\x06\x6f\x2e\x75\x96\x36\x01\x7e\xdb\ +\x2a\xb6\x41\x54\x9c\x08\xb0\x67\x91\x61\xa1\x86\x6e\x6d\x7b\xd5\ +\x44\xdd\x87\xd2\x50\x77\xf2\x0f\x43\x1d\x17\x7a\xaf\xe6\xee\x3a\ +\x00\x67\x22\xdb\x74\x89\x52\xa6\x38\xf9\x91\x96\x6b\x03\x58\xea\ +\x18\x73\xe2\x4e\xa2\x3d\xed\xcc\x57\xa5\x38\xa3\x45\x7d\x35\x2f\ +\xec\x00\x97\x2d\xe1\xf9\x3d\x22\x2c\xda\xe4\x0b\xfa\xc4\x2e\xda\ +\xb2\xcf\x9e\x49\x72\x45\xb9\x26\x22\xc9\x48\x02\x5b\x9c\x69\xa3\ +\x71\x6c\x9d\x50\xb9\x62\xcd\xf0\x21\xa1\xcb\x2d\xfd\x4a\xc4\xb0\ +\xe9\xa1\x30\x0f\xaf\x5e\x98\xe1\xa3\xd9\x51\xae\x73\x30\xa7\xae\ +\xb3\x1f\x20\xb2\xff\xfc\x3e\xfb\xfc\x3a\xfe\x03\x59\x11\x43\x35\ +\x53\xb6\xc7\x65\x79\x16\xfc\x42\xd2\x49\x09\xe3\x56\xf6\x86\xb3\ +\x9f\xa3\xef\xd3\xf1\x5d\xbf\x83\x3e\xa0\xb8\xea\xc9\x7e\x41\x72\ +\x0b\x9d\xb7\x24\x55\x97\xa3\x9b\xc9\x7d\x21\x07\x43\x89\x82\x77\ +\x07\x96\xde\x5f\xd6\x3b\x3f\x03\x11\xa3\x6b\x26\x96\x67\xfd\x7e\ +\x2c\x81\x00\x97\x7f\x3b\x7f\x00\x1a\xda\x9c\x8e\ " qt_resource_name = b"\ @@ -64,7 +63,7 @@ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x60\x3c\x11\x97\x26\ +\x00\x00\x01\x62\xd4\x90\x37\xa1\ " qt_version = QtCore.qVersion().split('.')
--- a/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines.qrc Sun Apr 15 10:50:50 2018 +0200 +++ b/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines.qrc Tue Apr 17 19:11:51 2018 +0200 @@ -10,6 +10,7 @@ <file>Google_Im_Feeling_Lucky.xml</file> <file>LEO_DeuEng.xml</file> <file>LinuxMagazin.xml</file> + <file>PyPI.xml</file> <file>Reddit.xml</file> <file>Wikia.xml</file> <file>Wikia_en.xml</file>
--- a/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py Sun Apr 15 10:50:50 2018 +0200 +++ b/Helpviewer/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py Tue Apr 17 19:11:51 2018 +0200 @@ -2,94 +2,13 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.9.1) +# Created by: The Resource Compiler for PyQt5 (Qt v5.10.0) # # WARNING! All changes made in this file will be lost! from PyQt5 import QtCore qt_resource_data = b"\ -\x00\x00\x01\x95\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x41\x6d\x61\x7a\x6f\x6e\ -\x2e\x63\x6f\x6d\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ -\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x41\x6d\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x20\x53\x65\x61\ -\x72\x63\x68\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ -\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ -\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ -\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ -\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\ -\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x2f\x65\x78\x65\x63\x2f\x6f\x62\ -\x69\x64\x6f\x73\x2f\x65\x78\x74\x65\x72\x6e\x61\x6c\x2d\x73\x65\ -\x61\x72\x63\x68\x2f\x3f\x66\x69\x65\x6c\x64\x2d\x6b\x65\x79\x77\ -\x6f\x72\x64\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ -\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ -\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\x61\x7a\ -\x6f\x6e\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ -\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ -\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ -\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x85\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x6f\x75\x54\x75\x62\ -\x65\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\ -\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\ -\x6f\x75\x54\x75\x62\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ -\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ -\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ -\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ -\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ -\x2e\x79\x6f\x75\x74\x75\x62\x65\x2e\x63\x6f\x6d\x2f\x72\x65\x73\ -\x75\x6c\x74\x73\x3f\x73\x65\x61\x72\x63\x68\x5f\x71\x75\x65\x72\ -\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\ -\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x53\x65\x61\x72\x63\ -\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x79\x6f\x75\x74\x75\ -\x62\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ -\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ -\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ -\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x79\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x42\x69\x6e\x67\x3c\x2f\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x42\x69\x6e\x67\ -\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ -\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ -\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ -\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\ -\x65\x61\x72\x63\x68\x3f\x63\x63\x3d\x7b\x6c\x61\x6e\x67\x75\x61\ -\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\ -\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ -\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ -\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\x2f\x77\x6c\x66\x6c\ -\x61\x67\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ -\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ -\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x06\xfe\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -204,139 +123,6 @@ \x55\x35\x45\x72\x6b\x4a\x67\x67\x67\x3d\x3d\x3c\x2f\x49\x6d\x61\ \x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ \x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x7e\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x46\x61\x63\x65\x62\x6f\ -\x6f\x6b\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\ -\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\ -\x53\x65\x61\x72\x63\x68\x20\x46\x61\x63\x65\x62\x6f\x6f\x6b\x3c\ -\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ -\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ -\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ -\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ -\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\ -\x6f\x6b\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\x73\ -\x72\x63\x3d\x6f\x73\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ -\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\ -\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\ -\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\x6f\x6b\x2e\x63\x6f\x6d\x2f\ -\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\ -\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x1e\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x44\x65\x2d\x45\x6e\x20\ -\x42\x65\x6f\x6c\x69\x6e\x67\x75\x73\x3c\x2f\x53\x68\x6f\x72\x74\ -\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\ -\x69\x70\x74\x69\x6f\x6e\x3e\x42\x65\x6f\x6c\x69\x6e\x67\x75\x73\ -\x3a\x20\x47\x65\x72\x6d\x61\x6e\x2d\x45\x6e\x67\x6c\x69\x73\x68\ -\x20\x44\x69\x63\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ -\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ -\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ -\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x64\x69\x63\x74\x2e\x74\x75\x2d\x63\x68\x65\x6d\x6e\x69\ -\x74\x7a\x2e\x64\x65\x2f\x3f\x71\x75\x65\x72\x79\x3d\x7b\x73\x65\ -\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\ -\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ -\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\ -\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\ -\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\ -\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\ -\x74\x75\x2d\x63\x68\x65\x6d\x6e\x69\x74\x7a\x2e\x64\x65\x2f\x73\ -\x75\x67\x67\x2e\x70\x68\x70\x3f\x6a\x73\x6f\x6e\x3d\x31\x26\x61\ -\x6d\x70\x3b\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ -\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ -\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\x74\x75\x2d\ -\x63\x68\x65\x6d\x6e\x69\x74\x7a\x2e\x64\x65\x2f\x70\x69\x63\x73\ -\x2f\x62\x65\x6f\x2d\x64\x65\x2e\x70\x6e\x67\x3c\x2f\x49\x6d\x61\ -\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x54\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x3c\ -\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\ -\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x57\x69\x6b\ -\x69\x61\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ -\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x69\x6e\x64\x65\x78\x2e\x70\ -\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\x65\x63\x69\x61\x6c\ -\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ -\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\x69\x61\ -\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\ -\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\ -\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\ -\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\ -\x73\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ -\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\x6d\x61\ -\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x77\x69\ -\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\x65\x73\ -\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\ -\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ -\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x0a\ -\x00\x00\x01\xc9\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x69\x6e\x75\x78\x2d\ -\x4d\x61\x67\x61\x7a\x69\x6e\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\ -\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x53\x75\x63\x68\x65\x20\x61\x75\x66\x20\x77\ -\x77\x77\x2e\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\ -\x2e\x64\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ -\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ -\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ -\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ -\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x6c\x69\ -\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\x2f\x63\ -\x6f\x6e\x74\x65\x6e\x74\x2f\x73\x65\x61\x72\x63\x68\x3f\x53\x65\ -\x61\x72\x63\x68\x54\x65\x78\x74\x3d\x7b\x73\x65\x61\x72\x63\x68\ -\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ -\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\ -\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\ -\x2f\x65\x78\x74\x65\x6e\x73\x69\x6f\x6e\x2f\x6c\x6e\x6d\x2f\x64\ -\x65\x73\x69\x67\x6e\x2f\x6c\x69\x6e\x75\x78\x5f\x6d\x61\x67\x61\ -\x7a\x69\x6e\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\x69\x63\ -\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ -\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ -\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x64\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -378,6 +164,270 @@ \x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ \x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ \x6e\x3e\x0a\ +\x00\x00\x02\x54\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x3c\ +\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\ +\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x57\x69\x6b\ +\x69\x61\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ +\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x69\x6e\x64\x65\x78\x2e\x70\ +\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\x65\x63\x69\x61\x6c\ +\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ +\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\x69\x61\ +\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\ +\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\ +\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\ +\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\ +\x73\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ +\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\x6d\x61\ +\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x77\x69\ +\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\x65\x73\ +\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\ +\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ +\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x0a\ +\x00\x00\x01\x9b\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x74\x69\x6f\ +\x6e\x61\x72\x79\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x57\x69\x6b\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\ +\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ +\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ +\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ +\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\ +\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x77\x2f\x69\x6e\ +\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\ +\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\ +\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ +\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\ +\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\x69\ +\x6b\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ +\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x85\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x6f\x75\x54\x75\x62\ +\x65\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\ +\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\ +\x6f\x75\x54\x75\x62\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ +\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ +\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ +\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ +\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ +\x2e\x79\x6f\x75\x74\x75\x62\x65\x2e\x63\x6f\x6d\x2f\x72\x65\x73\ +\x75\x6c\x74\x73\x3f\x73\x65\x61\x72\x63\x68\x5f\x71\x75\x65\x72\ +\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\ +\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x53\x65\x61\x72\x63\ +\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x79\x6f\x75\x74\x75\ +\x62\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ +\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ +\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ +\x6f\x6e\x3e\x0a\ +\x00\x00\x01\xc9\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x69\x6e\x75\x78\x2d\ +\x4d\x61\x67\x61\x7a\x69\x6e\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\ +\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x53\x75\x63\x68\x65\x20\x61\x75\x66\x20\x77\ +\x77\x77\x2e\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\ +\x2e\x64\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ +\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ +\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ +\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ +\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x6c\x69\ +\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\x2f\x63\ +\x6f\x6e\x74\x65\x6e\x74\x2f\x73\x65\x61\x72\x63\x68\x3f\x53\x65\ +\x61\x72\x63\x68\x54\x65\x78\x74\x3d\x7b\x73\x65\x61\x72\x63\x68\ +\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ +\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\ +\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\ +\x2f\x65\x78\x74\x65\x6e\x73\x69\x6f\x6e\x2f\x6c\x6e\x6d\x2f\x64\ +\x65\x73\x69\x67\x6e\x2f\x6c\x69\x6e\x75\x78\x5f\x6d\x61\x67\x61\ +\x7a\x69\x6e\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\x69\x63\ +\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ +\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ +\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x6f\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x52\x65\x64\x64\x69\x74\ +\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ +\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x52\x65\ +\x64\x64\x69\x74\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\ +\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\ +\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\ +\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\ +\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\ +\x74\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x71\x3d\x7b\ +\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\ +\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\x74\x2e\x63\x6f\x6d\ +\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\ +\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x27\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x61\x68\x6f\x6f\x21\ +\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ +\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\x61\ +\x68\x6f\x6f\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\ +\x6f\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x65\x69\x3d\ +\x75\x74\x66\x2d\x38\x26\x61\x6d\x70\x3b\x66\x72\x3d\x73\x66\x70\ +\x26\x61\x6d\x70\x3b\x69\x73\x63\x71\x72\x79\x3d\x26\x61\x6d\x70\ +\x3b\x70\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x66\x66\x2e\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\x6f\ +\x2e\x63\x6f\x6d\x2f\x67\x6f\x73\x73\x69\x70\x3f\x6f\x75\x74\x70\ +\x75\x74\x3d\x66\x78\x6a\x73\x6f\x6e\x26\x61\x6d\x70\x3b\x63\x6f\ +\x6d\x6d\x61\x6e\x64\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ +\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ +\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x6d\x2e\x77\x77\x77\x2e\x79\ +\x61\x68\x6f\x6f\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\ +\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\ +\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x5b\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x70\x65\ +\x64\x69\x61\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\ +\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ +\x3e\x46\x75\x6c\x6c\x20\x74\x65\x78\x74\x20\x73\x65\x61\x72\x63\ +\x68\x20\x69\x6e\x20\x57\x69\x6b\x69\x70\x65\x64\x69\x61\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ +\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\x67\x2f\x77\x69\x6b\ +\x69\x2f\x53\x70\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\ +\x3f\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ +\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x66\x75\x6c\x6c\x74\x65\ +\x78\x74\x3d\x53\x65\x61\x72\x63\x68\x22\x2f\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\ +\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\ +\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ +\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\ +\x72\x79\x7d\x2e\x77\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\ +\x67\x2f\x77\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\x69\ +\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\x6d\ +\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\ +\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\x73\ +\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ +\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\ +\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\x67\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ +\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x1e\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x44\x65\x2d\x45\x6e\x20\ +\x42\x65\x6f\x6c\x69\x6e\x67\x75\x73\x3c\x2f\x53\x68\x6f\x72\x74\ +\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\ +\x69\x70\x74\x69\x6f\x6e\x3e\x42\x65\x6f\x6c\x69\x6e\x67\x75\x73\ +\x3a\x20\x47\x65\x72\x6d\x61\x6e\x2d\x45\x6e\x67\x6c\x69\x73\x68\ +\x20\x44\x69\x63\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ +\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ +\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ +\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x64\x69\x63\x74\x2e\x74\x75\x2d\x63\x68\x65\x6d\x6e\x69\ +\x74\x7a\x2e\x64\x65\x2f\x3f\x71\x75\x65\x72\x79\x3d\x7b\x73\x65\ +\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\ +\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ +\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\ +\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\ +\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\ +\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\ +\x74\x75\x2d\x63\x68\x65\x6d\x6e\x69\x74\x7a\x2e\x64\x65\x2f\x73\ +\x75\x67\x67\x2e\x70\x68\x70\x3f\x6a\x73\x6f\x6e\x3d\x31\x26\x61\ +\x6d\x70\x3b\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ +\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ +\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\x74\x75\x2d\ +\x63\x68\x65\x6d\x6e\x69\x74\x7a\x2e\x64\x65\x2f\x70\x69\x63\x73\ +\x2f\x62\x65\x6f\x2d\x64\x65\x2e\x70\x6e\x67\x3c\x2f\x49\x6d\x61\ +\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x46\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -417,7 +467,7 @@ \x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ \x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ \x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x6f\ +\x00\x00\x01\x74\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -426,23 +476,24 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x52\x65\x64\x64\x69\x74\ -\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ -\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x52\x65\ -\x64\x64\x69\x74\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\ -\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\ -\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\ -\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\ -\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\ -\x74\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x71\x3d\x7b\ -\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\ -\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\x74\x2e\x63\x6f\x6d\ -\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\ -\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x9b\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x50\x79\x50\x49\x3c\x2f\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x53\x65\x61\x72\ +\x63\x68\x20\x50\x79\x50\x49\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ +\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ +\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\ +\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x73\x3a\x2f\x2f\x70\ +\x79\x70\x69\x2e\x6f\x72\x67\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\ +\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\ +\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\ +\x74\x70\x73\x3a\x2f\x2f\x70\x79\x70\x69\x2e\x6f\x72\x67\x2f\x73\ +\x74\x61\x74\x69\x63\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x36\x61\x37\x36\x32\x37\x35\x64\x2e\x69\x63\ +\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ +\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x0a\ +\x00\x00\x01\x95\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -451,25 +502,25 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x74\x69\x6f\ -\x6e\x61\x72\x79\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x41\x6d\x61\x7a\x6f\x6e\ +\x2e\x63\x6f\x6d\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ \x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x57\x69\x6b\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\ -\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ -\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ -\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ -\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ -\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\ -\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x77\x2f\x69\x6e\ -\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\ -\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\ -\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ -\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\ -\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\x69\ -\x6b\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x66\x61\x76\ -\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ -\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x6e\x3e\x41\x6d\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x20\x53\x65\x61\ +\x72\x63\x68\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ +\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ +\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ +\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ +\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\ +\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x2f\x65\x78\x65\x63\x2f\x6f\x62\ +\x69\x64\x6f\x73\x2f\x65\x78\x74\x65\x72\x6e\x61\x6c\x2d\x73\x65\ +\x61\x72\x63\x68\x2f\x3f\x66\x69\x65\x6c\x64\x2d\x6b\x65\x79\x77\ +\x6f\x72\x64\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ +\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ +\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\x61\x7a\ +\x6f\x6e\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ +\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ +\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ +\x6f\x6e\x3e\x0a\ \x00\x00\x02\x46\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -509,6 +560,58 @@ \x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ \x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ \x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x79\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x42\x69\x6e\x67\x3c\x2f\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x42\x69\x6e\x67\ +\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ +\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ +\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ +\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\ +\x65\x61\x72\x63\x68\x3f\x63\x63\x3d\x7b\x6c\x61\x6e\x67\x75\x61\ +\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\ +\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ +\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ +\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\x2f\x77\x6c\x66\x6c\ +\x61\x67\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ +\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ +\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x7e\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x46\x61\x63\x65\x62\x6f\ +\x6f\x6b\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\ +\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\ +\x53\x65\x61\x72\x63\x68\x20\x46\x61\x63\x65\x62\x6f\x6f\x6b\x3c\ +\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ +\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ +\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ +\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ +\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\ +\x6f\x6b\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\x73\ +\x72\x63\x3d\x6f\x73\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ +\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\ +\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\ +\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\x6f\x6b\x2e\x63\x6f\x6d\x2f\ +\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\ +\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x7a\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -551,208 +654,138 @@ \x6e\x64\x65\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\ \x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\ \x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x5b\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x70\x65\ -\x64\x69\x61\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\ -\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ -\x3e\x46\x75\x6c\x6c\x20\x74\x65\x78\x74\x20\x73\x65\x61\x72\x63\ -\x68\x20\x69\x6e\x20\x57\x69\x6b\x69\x70\x65\x64\x69\x61\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ -\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\x67\x2f\x77\x69\x6b\ -\x69\x2f\x53\x70\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\ -\x3f\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ -\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x66\x75\x6c\x6c\x74\x65\ -\x78\x74\x3d\x53\x65\x61\x72\x63\x68\x22\x2f\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\ -\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\ -\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ -\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\ -\x72\x79\x7d\x2e\x77\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\ -\x67\x2f\x77\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\x69\ -\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\x6d\ -\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\ -\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\x73\ -\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ -\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\ -\x69\x6b\x69\x70\x65\x64\x69\x61\x2e\x6f\x72\x67\x2f\x66\x61\x76\ -\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ -\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x27\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x61\x68\x6f\x6f\x21\ -\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ -\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\x61\ -\x68\x6f\x6f\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\ -\x6f\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x65\x69\x3d\ -\x75\x74\x66\x2d\x38\x26\x61\x6d\x70\x3b\x66\x72\x3d\x73\x66\x70\ -\x26\x61\x6d\x70\x3b\x69\x73\x63\x71\x72\x79\x3d\x26\x61\x6d\x70\ -\x3b\x70\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x66\x66\x2e\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\x6f\ -\x2e\x63\x6f\x6d\x2f\x67\x6f\x73\x73\x69\x70\x3f\x6f\x75\x74\x70\ -\x75\x74\x3d\x66\x78\x6a\x73\x6f\x6e\x26\x61\x6d\x70\x3b\x63\x6f\ -\x6d\x6d\x61\x6e\x64\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ -\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ -\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x6d\x2e\x77\x77\x77\x2e\x79\ -\x61\x68\x6f\x6f\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\ -\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\ -\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x0a\ " qt_resource_name = b"\ -\x00\x0d\ -\x0a\x2e\x72\x9c\ -\x00\x41\ -\x00\x6d\x00\x61\x00\x7a\x00\x6f\x00\x6e\x00\x63\x00\x6f\x00\x6d\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0e\ +\x09\x21\x3a\xfc\ +\x00\x44\ +\x00\x75\x00\x63\x00\x6b\x00\x44\x00\x75\x00\x63\x00\x6b\x00\x47\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x1b\ +\x0d\x52\x43\x5c\ +\x00\x47\ +\x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x5f\x00\x49\x00\x6d\x00\x5f\x00\x46\x00\x65\x00\x65\x00\x6c\x00\x69\x00\x6e\x00\x67\ +\x00\x5f\x00\x4c\x00\x75\x00\x63\x00\x6b\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x09\ +\x01\xf4\xe3\x3c\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0e\ +\x08\xce\x7c\x3c\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x61\x00\x72\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0b\ \x0b\x48\x8a\x5c\ \x00\x59\ \x00\x6f\x00\x75\x00\x54\x00\x75\x00\x62\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x08\ -\x00\x4a\x56\x1c\ -\x00\x42\ -\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0e\ -\x09\x21\x3a\xfc\ -\x00\x44\ -\x00\x75\x00\x63\x00\x6b\x00\x44\x00\x75\x00\x63\x00\x6b\x00\x47\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0c\ -\x0f\xd5\x68\x1c\ -\x00\x46\ -\x00\x61\x00\x63\x00\x65\x00\x62\x00\x6f\x00\x6f\x00\x6b\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x10\ +\x09\x73\x65\x7c\ +\x00\x4c\ +\x00\x69\x00\x6e\x00\x75\x00\x78\x00\x4d\x00\x61\x00\x67\x00\x61\x00\x7a\x00\x69\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0a\ +\x0b\x0c\x48\x7c\ +\x00\x52\ +\x00\x65\x00\x64\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x09\ +\x0f\x62\xe1\xdc\ +\x00\x59\ +\x00\x61\x00\x68\x00\x6f\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0d\ +\x06\xf8\x53\x3c\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x69\x00\x70\x00\x65\x00\x64\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x12\ \x0a\xf9\x0f\x7c\ \x00\x44\ \x00\x65\x00\x45\x00\x6e\x00\x5f\x00\x42\x00\x65\x00\x6f\x00\x6c\x00\x69\x00\x6e\x00\x67\x00\x75\x00\x73\x00\x2e\x00\x78\x00\x6d\ \x00\x6c\ -\x00\x09\ -\x01\xf4\xe3\x3c\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x10\ -\x09\x73\x65\x7c\ -\x00\x4c\ -\x00\x69\x00\x6e\x00\x75\x00\x78\x00\x4d\x00\x61\x00\x67\x00\x61\x00\x7a\x00\x69\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x1b\ -\x0d\x52\x43\x5c\ -\x00\x47\ -\x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x5f\x00\x49\x00\x6d\x00\x5f\x00\x46\x00\x65\x00\x65\x00\x6c\x00\x69\x00\x6e\x00\x67\ -\x00\x5f\x00\x4c\x00\x75\x00\x63\x00\x6b\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0a\ \x0e\x31\x93\x9c\ \x00\x47\ \x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0a\ -\x0b\x0c\x48\x7c\ -\x00\x52\ -\x00\x65\x00\x64\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0e\ -\x08\xce\x7c\x3c\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x74\x00\x69\x00\x6f\x00\x6e\x00\x61\x00\x72\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x08\ +\x0e\x4c\x55\xdc\ +\x00\x50\ +\x00\x79\x00\x50\x00\x49\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0d\ +\x0a\x2e\x72\x9c\ +\x00\x41\ +\x00\x6d\x00\x61\x00\x7a\x00\x6f\x00\x6e\x00\x63\x00\x6f\x00\x6d\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0c\ \x0e\x81\x61\xdc\ \x00\x57\ \x00\x69\x00\x6b\x00\x69\x00\x61\x00\x5f\x00\x65\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x08\ +\x00\x4a\x56\x1c\ +\x00\x42\ +\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0c\ +\x0f\xd5\x68\x1c\ +\x00\x46\ +\x00\x61\x00\x63\x00\x65\x00\x62\x00\x6f\x00\x6f\x00\x6b\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0e\ \x00\xf1\x12\x1c\ \x00\x4c\ \x00\x45\x00\x4f\x00\x5f\x00\x44\x00\x65\x00\x75\x00\x45\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0d\ -\x06\xf8\x53\x3c\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x69\x00\x70\x00\x65\x00\x64\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x09\ -\x0f\x62\xe1\xdc\ -\x00\x59\ -\x00\x61\x00\x68\x00\x6f\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ " qt_resource_struct_v1 = b"\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x10\x00\x00\x00\x01\ -\x00\x00\x00\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x03\x22\ -\x00\x00\x01\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x78\ -\x00\x00\x00\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x45\ -\x00\x00\x01\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x1f\xf6\ -\x00\x00\x01\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x19\x8f\ -\x00\x00\x00\x52\x00\x00\x00\x00\x00\x01\x00\x00\x04\x9f\ -\x00\x00\x00\xd4\x00\x00\x00\x00\x00\x01\x00\x00\x11\x9d\ +\x00\x00\x00\x00\x00\x02\x00\x00\x00\x11\x00\x00\x00\x01\ +\x00\x00\x01\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x20\x7b\ +\x00\x00\x01\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x23\x7a\ +\x00\x00\x00\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x09\x6a\ +\x00\x00\x01\x0c\x00\x00\x00\x00\x00\x01\x00\x00\x14\x55\ +\x00\x00\x00\x76\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xc2\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x00\x92\x00\x00\x00\x00\x00\x01\x00\x00\x0d\x23\ -\x00\x00\x01\x50\x00\x00\x00\x00\x00\x01\x00\x00\x18\x1c\ -\x00\x00\x00\x20\x00\x00\x00\x00\x00\x01\x00\x00\x01\x99\ -\x00\x00\x00\xfa\x00\x00\x00\x00\x00\x01\x00\x00\x13\x6a\ -\x00\x00\x01\x36\x00\x00\x00\x00\x00\x01\x00\x00\x15\xd2\ -\x00\x00\x01\x8c\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x2e\ -\x00\x00\x01\xec\x00\x00\x00\x00\x00\x01\x00\x00\x22\x55\ -\x00\x00\x00\x74\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xa1\ +\x00\x00\x00\xb4\x00\x00\x00\x00\x00\x01\x00\x00\x0e\xea\ +\x00\x00\x01\x86\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x98\ +\x00\x00\x01\x2c\x00\x00\x00\x00\x00\x01\x00\x00\x16\xb4\ +\x00\x00\x00\xda\x00\x00\x00\x00\x00\x01\x00\x00\x10\xb7\ +\x00\x00\x00\x98\x00\x00\x00\x00\x00\x01\x00\x00\x0d\x61\ +\x00\x00\x00\x22\x00\x00\x00\x00\x00\x01\x00\x00\x07\x02\ +\x00\x00\x01\x56\x00\x00\x00\x00\x00\x01\x00\x00\x18\xd6\ +\x00\x00\x01\x70\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x20\ +\x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x1e\x31\ +\x00\x00\x00\xf4\x00\x00\x00\x00\x00\x01\x00\x00\x12\x2a\ +\x00\x00\x01\xda\x00\x00\x00\x00\x00\x01\x00\x00\x21\xf8\ " qt_resource_struct_v2 = b"\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x10\x00\x00\x00\x01\ +\x00\x00\x00\x00\x00\x02\x00\x00\x00\x11\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x00\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x03\x22\ -\x00\x00\x01\x41\xb2\x46\xfd\xf8\ -\x00\x00\x01\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x78\ -\x00\x00\x01\x44\x5e\x8a\xfd\x38\ -\x00\x00\x00\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x45\ +\x00\x00\x01\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x20\x7b\ \x00\x00\x01\x41\xb2\x46\xfd\xf8\ -\x00\x00\x01\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x1f\xf6\ -\x00\x00\x01\x41\xb2\x46\xfd\xf8\ -\x00\x00\x01\x6a\x00\x00\x00\x00\x00\x01\x00\x00\x19\x8f\ +\x00\x00\x01\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x23\x7a\ +\x00\x00\x01\x44\x5e\x8a\xfd\x38\ +\x00\x00\x00\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x09\x6a\ \x00\x00\x01\x41\xb2\x46\xfd\xf8\ -\x00\x00\x00\x52\x00\x00\x00\x00\x00\x01\x00\x00\x04\x9f\ -\x00\x00\x01\x48\x75\x3e\xeb\xf8\ -\x00\x00\x00\xd4\x00\x00\x00\x00\x00\x01\x00\x00\x11\x9d\ +\x00\x00\x01\x0c\x00\x00\x00\x00\x00\x01\x00\x00\x14\x55\ +\x00\x00\x01\x41\xb2\x46\xfd\xf8\ +\x00\x00\x00\x76\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xc2\ \x00\x00\x01\x41\xb2\x46\xfd\xf8\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ +\x00\x00\x01\x48\x75\x3e\xeb\xf8\ +\x00\x00\x00\xb4\x00\x00\x00\x00\x00\x01\x00\x00\x0e\xea\ \x00\x00\x01\x41\xb2\x46\xfd\xf8\ -\x00\x00\x00\x92\x00\x00\x00\x00\x00\x01\x00\x00\x0d\x23\ +\x00\x00\x01\x86\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x98\ +\x00\x00\x01\x41\xb2\x46\xfd\xf8\ +\x00\x00\x01\x2c\x00\x00\x00\x00\x00\x01\x00\x00\x16\xb4\ \x00\x00\x01\x48\x7a\x6f\x23\x68\ -\x00\x00\x01\x50\x00\x00\x00\x00\x00\x01\x00\x00\x18\x1c\ +\x00\x00\x00\xda\x00\x00\x00\x00\x00\x01\x00\x00\x10\xb7\ \x00\x00\x01\x41\xb2\x46\xfd\xf8\ -\x00\x00\x00\x20\x00\x00\x00\x00\x00\x01\x00\x00\x01\x99\ +\x00\x00\x00\x98\x00\x00\x00\x00\x00\x01\x00\x00\x0d\x61\ \x00\x00\x01\x48\x7a\x7c\x04\x48\ -\x00\x00\x00\xfa\x00\x00\x00\x00\x00\x01\x00\x00\x13\x6a\ +\x00\x00\x00\x22\x00\x00\x00\x00\x00\x01\x00\x00\x07\x02\ \x00\x00\x01\x48\x7a\x62\xc3\x70\ -\x00\x00\x01\x36\x00\x00\x00\x00\x00\x01\x00\x00\x15\xd2\ +\x00\x00\x01\x56\x00\x00\x00\x00\x00\x01\x00\x00\x18\xd6\ \x00\x00\x01\x48\x7a\x62\x79\x38\ -\x00\x00\x01\x8c\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x2e\ +\x00\x00\x01\x70\x00\x00\x00\x00\x00\x01\x00\x00\x1b\x20\ +\x00\x00\x01\x62\xd4\x92\x04\x90\ +\x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x1e\x31\ \x00\x00\x01\x41\xb2\x46\xfd\xf8\ -\x00\x00\x01\xec\x00\x00\x00\x00\x00\x01\x00\x00\x22\x55\ +\x00\x00\x00\xf4\x00\x00\x00\x00\x00\x01\x00\x00\x12\x2a\ \x00\x00\x01\x41\xb2\x46\xfd\xf8\ -\x00\x00\x00\x74\x00\x00\x00\x00\x00\x01\x00\x00\x0b\xa1\ +\x00\x00\x01\xda\x00\x00\x00\x00\x00\x01\x00\x00\x21\xf8\ \x00\x00\x01\x41\xb2\x46\xfd\xf8\ "
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Helpviewer/OpenSearch/DefaultSearchEngines/PyPI.xml Tue Apr 17 19:11:51 2018 +0200 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>PyPI</ShortName> + <Description>Search PyPI</Description> + <Url method="get" type="text/html" template="https://pypi.org/search/?q={searchTerms}"/> + <Image>https://pypi.org/static/images/favicon.6a76275d.ico</Image> +</OpenSearchDescription>
--- a/Plugins/UiExtensionPlugins/PipInterface/ConfigurationPage/PipPage.py Sun Apr 15 10:50:50 2018 +0200 +++ b/Plugins/UiExtensionPlugins/PipInterface/ConfigurationPage/PipPage.py Tue Apr 17 19:11:51 2018 +0200 @@ -19,7 +19,7 @@ ConfigurationPageBase from .Ui_PipPage import Ui_PipPage -from .. import DefaultIndexUrl +from .. import DefaultPyPiUrl import Utilities @@ -52,7 +52,7 @@ self.indexLabel.setText(self.tr( '<b>Note:</b> Leave empty to use the default index URL (' '<a href="{0}">{0}</a>).') - .format(DefaultIndexUrl)) + .format(DefaultPyPiUrl)) # set initial values self.__model.setStringList(
--- a/Plugins/UiExtensionPlugins/PipInterface/PipPackageDetailsDialog.py Sun Apr 15 10:50:50 2018 +0200 +++ b/Plugins/UiExtensionPlugins/PipInterface/PipPackageDetailsDialog.py Tue Apr 17 19:11:51 2018 +0200 @@ -138,25 +138,25 @@ @param detailsData package details (dict) """ - populated = False + populatedItems = 0 if "requires" in detailsData: self.requiredPackagesList.addItems(detailsData["requires"]) - populated = True + populatedItems += len(detailsData["requires"]) if "requires_dist" in detailsData: self.requiredDistributionsList.addItems( detailsData["requires_dist"]) - populated = True + populatedItems += len(detailsData["requires_dist"]) if "provides" in detailsData: self.providedPackagesList.addItems(detailsData["provides"]) - populated = True + populatedItems += len(detailsData["provides"]) if "provides_dist" in detailsData: self.providedDistributionsList.addItems( detailsData["provides_dist"]) - populated = True + populatedItems += len(detailsData["provides_dist"]) index = self.infoWidget.indexOf(self.requires) - self.infoWidget.setTabEnabled(index, populated) + self.infoWidget.setTabEnabled(index, populatedItems > 0) def __sanitize(self, text, forUrl=False): """ @@ -184,10 +184,15 @@ """ Private method to format the upload date. - @param datetime upload date and time (xmlrpc.DateTime) - @return formatted date string (string) + @param datetime upload date and time + @type xmlrpc.DateTime or str + @return formatted date string + @rtype str """ - date = datetime.value.split("T")[0] + if isinstance(datetime, str): + date = datetime.split("T")[0] + else: + date = datetime.value.split("T")[0] return "{0}-{1}-{2}".format(date[:4], date[4:6], date[6:]) def __formatSize(self, size):
--- a/Plugins/UiExtensionPlugins/PipInterface/__init__.py Sun Apr 15 10:50:50 2018 +0200 +++ b/Plugins/UiExtensionPlugins/PipInterface/__init__.py Tue Apr 17 19:11:51 2018 +0200 @@ -9,4 +9,5 @@ from __future__ import unicode_literals -DefaultIndexUrl = "https://pypi.python.org/pypi" +DefaultPyPiUrl = "https://pypi.org" +DefaultIndexUrl = DefaultPyPiUrl + "/pypi"
--- a/WebBrowser/Bookmarks/DefaultBookmarks.xbel Sun Apr 15 10:50:50 2018 +0200 +++ b/WebBrowser/Bookmarks/DefaultBookmarks.xbel Tue Apr 17 19:11:51 2018 +0200 @@ -41,7 +41,7 @@ <bookmark href="https://www.python.org/"> <title>Python Language Website</title> </bookmark> - <bookmark href="https://pypi.python.org/pypi"> + <bookmark href="https://pypi.org/"> <title>Python Package Index: PyPI</title> </bookmark> </folder>
--- a/WebBrowser/Bookmarks/DefaultBookmarks_rc.py Sun Apr 15 10:50:50 2018 +0200 +++ b/WebBrowser/Bookmarks/DefaultBookmarks_rc.py Tue Apr 17 19:11:51 2018 +0200 @@ -2,49 +2,48 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.9.3) +# Created by: The Resource Compiler for PyQt5 (Qt v5.10.0) # # WARNING! All changes made in this file will be lost! from PyQt5 import QtCore qt_resource_data = b"\ -\x00\x00\x02\x11\ +\x00\x00\x02\x0d\ \x00\ -\x00\x09\x30\x78\x9c\xdd\x96\xdd\x6f\xda\x30\x10\xc0\xdf\xfb\x57\ -\x78\x79\x18\x9b\x26\xe2\x4d\xda\xc3\x44\x13\xd0\xf8\x98\xd4\xa9\ -\x53\x53\xd1\x69\xea\xa3\xe3\x1c\xe0\xe2\xd8\x9e\xed\x10\xf8\xef\ -\xe7\x7c\xb0\x02\xcd\x80\xb6\x79\x5a\x5e\x1c\xfb\xce\xf7\xbb\xbb\ -\x9c\xcf\x09\x06\xeb\x94\xa3\x15\x68\xc3\xa4\x08\xbd\x4f\xfe\x47\ -\x0f\x81\xa0\x32\x61\x62\x1e\x7a\x99\x9d\x75\xbf\x78\x83\xfe\x45\ -\xf0\x66\x7c\x33\xba\xbb\x8f\x26\x68\x1d\x03\x77\xf3\x62\xd8\xdf\ -\xd6\xbf\x40\xee\x09\x66\x92\x27\xa0\x51\x39\x24\xa1\x27\x64\x2d\ -\x28\x85\x96\x59\x0e\xfd\xa1\x94\xcb\x94\xe8\xa5\x41\x43\xa2\x03\ -\x5c\x2d\x3e\x2a\xc5\xb5\x18\x2d\x34\xcc\x42\x6f\x61\xad\x32\x3d\ -\x8c\x41\x33\xda\x65\x09\xf8\x6a\x63\x17\x52\x74\x95\x96\x0f\x40\ -\xad\xf1\xa5\x9e\xe3\x1d\xc8\x0e\x68\xe2\xb6\xa0\x5f\x10\xa3\x29\ -\xb3\xf0\x14\x84\xb7\xa4\xd3\xf0\x3c\xcf\x7d\xcd\x5c\xbc\x31\x11\ -\x4b\x2a\x53\x95\x59\x97\x20\xdf\xbd\x61\x01\xb9\x69\xc6\x47\x9b\ -\x5b\xfb\x4c\xfc\xb1\xec\xed\x58\xde\xb1\x6b\x9e\x18\xfe\x57\x1c\ -\x75\x18\xbf\xad\xcf\x24\x3e\xcc\x58\xb3\xf1\x66\xdb\x0d\x8e\x9f\ -\xc5\x4c\x60\x05\x5c\x2a\x57\x34\xc7\xe9\xe3\xbf\x7a\x6d\xf0\x13\ -\x49\x6b\xfe\x71\xa8\xa4\x59\x0a\xc2\x12\xeb\x2a\xba\x0d\x6e\xcc\ -\xe5\xfc\x1c\xf0\xd0\xe9\xb5\xc1\x9b\x49\x9d\xa5\xe7\x00\xbf\x15\ -\x8a\x6d\x10\x15\x27\x02\xec\x49\x64\x54\xaa\xa1\x5b\xdb\x5e\x35\ -\x51\xf7\xa1\x34\x34\x9d\xfc\xfd\x50\x47\xa5\xde\xab\xb9\xdb\x0e\ -\xc0\x99\xc8\xd6\x5d\xa2\x94\x29\x4f\x7e\xac\x65\x6e\x00\x4b\x9d\ -\x60\x4e\xdc\x49\xb4\xc7\x9d\xf9\xaa\x14\x67\xb4\xac\xaf\xf3\x0b\ -\x3b\xc0\x55\x4b\x78\x7e\x8f\x88\xca\x36\xf9\x82\x3e\xb1\x8d\xb6\ -\xea\xb3\x27\x92\x5c\x53\xae\x89\x98\x67\x64\x0e\x05\xce\xb4\xd1\ -\x38\x0a\x27\xd4\x46\xb1\x5d\x2f\x8a\xf9\x49\x4f\x22\x42\x97\x85\ -\x23\x57\x22\x81\x75\x0f\x45\x9b\xe8\xea\x85\xc9\x3e\x98\x1d\xa4\ -\x7d\x03\xe6\xd8\xcd\xf6\x03\x44\xf6\x9f\x5f\x6d\x9f\x5f\xc7\x7f\ -\x20\x2b\x62\xa8\x66\xca\xf6\xb8\xac\x8e\x85\x5f\x4a\x3a\x29\x61\ -\xdc\xca\xde\x60\xfa\x73\xf8\x7d\x32\xba\x0b\x3b\xe8\x03\x4a\xea\ -\xf6\xec\x97\x24\xb7\xd0\x79\x4b\x52\x75\x39\xbc\x19\xdf\x97\x72\ -\x30\x94\x28\x78\xb7\x67\xe9\xfd\x65\xb3\xf3\x53\x10\x09\xba\x66\ -\x62\x79\xd2\xef\xc7\x12\x08\x70\xf5\xe3\xf3\x07\x41\xbe\xa1\x20\ -\ +\x00\x09\x25\x78\x9c\xdd\x96\x5f\x6f\xda\x30\x10\xc0\xdf\xfb\x29\ +\xbc\x3c\x8c\x4d\x13\xf1\x26\xed\x61\xa2\x01\x34\xfe\x4c\xea\xd4\ +\xa9\xa9\xe8\x34\xf5\xd1\x71\x8e\xe0\xe2\xd8\x9e\xed\x00\xf9\xf6\ +\x33\x49\x58\x81\x66\x90\xb6\x79\x5a\x5e\x1c\xfb\xce\xf7\xbb\xbb\ +\x9c\xcf\x09\x86\x9b\x94\xa3\x15\x68\xc3\xa4\xe8\x7b\x9f\xfc\x8f\ +\x1e\x02\x41\x65\xcc\x44\xd2\xf7\x32\x3b\xef\x7e\xf1\x86\x83\x8b\ +\xe0\xcd\xe4\x66\x7c\x77\x1f\x4e\xd1\x26\x02\xee\xe6\xdb\xe1\x70\ +\xdb\xe0\x02\xb9\x27\x98\x4b\x1e\x83\x46\xc5\x10\xf7\x3d\x21\x2b\ +\x41\x21\xb4\xcc\x72\x18\x8c\xa4\x5c\xa6\x44\x2f\x0d\x1a\x11\x1d\ +\xe0\x72\xf1\x51\x29\xaa\xc4\x68\xa1\x61\xde\xf7\x16\xd6\x2a\xd3\ +\xc3\x18\x34\xa3\x5d\x16\x83\xaf\x72\xbb\x90\xa2\xab\xb4\x7c\x00\ +\x6a\x8d\x2f\x75\x82\xf7\x20\x7b\xa0\xa9\xdb\x82\x7e\x41\x84\x66\ +\xcc\xc2\x53\x10\xde\x91\xce\xc3\xd7\xeb\xb5\xaf\x99\x8b\x37\x22\ +\x62\x49\x65\xaa\x32\xeb\x12\xe4\xbb\x37\x2c\x60\x6d\xea\xf1\x61\ +\x7e\x6b\x9f\x89\x3f\x95\xbd\x3d\xcb\x7b\x76\xcd\x13\xc3\xff\x8a\ +\xa3\x0a\xe3\xb7\xf5\x99\xc4\xc7\x19\xab\x37\x5e\x6f\xbb\xc6\xf1\ +\x46\xcc\x18\x56\xc0\xa5\x72\x45\x73\x9a\x3e\xf9\xab\xd7\x06\x3f\ +\x96\xb4\xe2\x9f\x86\x4a\x9a\xa5\x20\x2c\xb1\xae\xa2\xdb\xe0\x46\ +\x5c\x26\x4d\xc0\x23\xa7\xd7\x06\x6f\x2e\x75\x96\x36\x01\x7e\xdb\ +\x2a\xb6\x41\x54\x9c\x08\xb0\x67\x91\x61\xa1\x86\x6e\x6d\x7b\xd5\ +\x44\xdd\x87\xd2\x50\x77\xf2\x0f\x43\x1d\x17\x7a\xaf\xe6\xee\x3a\ +\x00\x67\x22\xdb\x74\x89\x52\xa6\x38\xf9\x91\x96\x6b\x03\x58\xea\ +\x18\x73\xe2\x4e\xa2\x3d\xed\xcc\x57\xa5\x38\xa3\x45\x7d\x35\x2f\ +\xec\x00\x97\x2d\xe1\xf9\x3d\x22\x2c\xda\xe4\x0b\xfa\xc4\x2e\xda\ +\xb2\xcf\x9e\x49\x72\x45\xb9\x26\x22\xc9\x48\x02\x5b\x9c\x69\xa3\ +\x71\x6c\x9d\x50\xb9\x62\xcd\xf0\x21\xa1\xcb\x2d\xfd\x4a\xc4\xb0\ +\xe9\xa1\x30\x0f\xaf\x5e\x98\xe1\xa3\xd9\x51\xae\x73\x30\xa7\xae\ +\xb3\x1f\x20\xb2\xff\xfc\x3e\xfb\xfc\x3a\xfe\x03\x59\x11\x43\x35\ +\x53\xb6\xc7\x65\x79\x16\xfc\x42\xd2\x49\x09\xe3\x56\xf6\x86\xb3\ +\x9f\xa3\xef\xd3\xf1\x5d\xbf\x83\x3e\xa0\xb8\xea\xc9\x7e\x41\x72\ +\x0b\x9d\xb7\x24\x55\x97\xa3\x9b\xc9\x7d\x21\x07\x43\x89\x82\x77\ +\x07\x96\xde\x5f\xd6\x3b\x3f\x03\x11\xa3\x6b\x26\x96\x67\xfd\x7e\ +\x2c\x81\x00\x97\x7f\x3b\x7f\x00\x1a\xda\x9c\x8e\ " qt_resource_name = b"\ @@ -64,7 +63,7 @@ \x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ \x00\x00\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x01\x60\x3c\x0f\x9e\x57\ +\x00\x00\x01\x62\xd4\x90\x7f\x9d\ " qt_version = QtCore.qVersion().split('.')
--- a/WebBrowser/OpenSearch/DefaultSearchEngines/DefaultSearchEngines.qrc Sun Apr 15 10:50:50 2018 +0200 +++ b/WebBrowser/OpenSearch/DefaultSearchEngines/DefaultSearchEngines.qrc Tue Apr 17 19:11:51 2018 +0200 @@ -10,6 +10,7 @@ <file>Google_Im_Feeling_Lucky.xml</file> <file>LEO_DeuEng.xml</file> <file>LinuxMagazin.xml</file> + <file>PyPI.xml</file> <file>Reddit.xml</file> <file>Wikia.xml</file> <file>Wikia_en.xml</file>
--- a/WebBrowser/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py Sun Apr 15 10:50:50 2018 +0200 +++ b/WebBrowser/OpenSearch/DefaultSearchEngines/DefaultSearchEngines_rc.py Tue Apr 17 19:11:51 2018 +0200 @@ -2,13 +2,39 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.9.1) +# Created by: The Resource Compiler for PyQt5 (Qt v5.10.0) # # WARNING! All changes made in this file will be lost! from PyQt5 import QtCore qt_resource_data = b"\ +\x00\x00\x01\x79\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x42\x69\x6e\x67\x3c\x2f\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x42\x69\x6e\x67\ +\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ +\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ +\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ +\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\ +\x65\x61\x72\x63\x68\x3f\x63\x63\x3d\x7b\x6c\x61\x6e\x67\x75\x61\ +\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\ +\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ +\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ +\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\x2f\x77\x6c\x66\x6c\ +\x61\x67\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ +\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ +\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x46\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -18,37 +44,63 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x20\ -\x28\x65\x6e\x29\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ -\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x57\x69\x6b\x69\x61\x20\x28\x65\x6e\x29\x3c\x2f\x44\x65\ -\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ -\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ -\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ -\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ -\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\ -\x2f\x69\x6e\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\ -\x3d\x53\x70\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\ -\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\ -\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\ -\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\ -\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\ -\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\ -\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\ -\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x69\x6b\ -\x69\x61\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\ -\x63\x74\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\ -\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\ -\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\ -\x6d\x65\x73\x70\x61\x63\x65\x3d\x31\x22\x2f\x3e\x0a\x20\x20\x20\ -\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\ -\x6d\x61\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\ -\x77\x69\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\ -\x65\x73\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x47\x6f\x6f\x67\x6c\x65\ +\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ +\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x47\x6f\ +\x6f\x67\x6c\x65\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\ +\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ +\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ +\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ +\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ +\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\x6f\x67\x6c\x65\ +\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x68\x6c\x3d\x7b\ +\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\x6d\x70\x3b\x6c\x72\ +\x3d\x6c\x61\x6e\x67\x5f\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\ +\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\ +\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\ +\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\ +\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\ +\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\ +\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x73\x75\x67\x67\x65\x73\x74\x71\x75\x65\x72\ +\x69\x65\x73\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x63\ +\x6f\x6d\x70\x6c\x65\x74\x65\x2f\x73\x65\x61\x72\x63\x68\x3f\x6f\ +\x75\x74\x70\x75\x74\x3d\x66\x69\x72\x65\x66\x6f\x78\x26\x61\x6d\ +\x70\x3b\x68\x6c\x3d\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\ +\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ +\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ +\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\x6f\ +\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\ \x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ \x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ \x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x27\ +\x00\x00\x01\x74\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x50\x79\x50\x49\x3c\x2f\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x53\x65\x61\x72\ +\x63\x68\x20\x50\x79\x50\x49\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\ +\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\ +\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\ +\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x73\x3a\x2f\x2f\x70\ +\x79\x70\x69\x2e\x6f\x72\x67\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\ +\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\ +\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\ +\x74\x70\x73\x3a\x2f\x2f\x70\x79\x70\x69\x2e\x6f\x72\x67\x2f\x73\ +\x74\x61\x74\x69\x63\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x36\x61\x37\x36\x32\x37\x35\x64\x2e\x69\x63\ +\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ +\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x0a\ +\x00\x00\x01\x9b\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -57,35 +109,26 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x61\x68\x6f\x6f\x21\ -\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ -\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\x61\ -\x68\x6f\x6f\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\ -\x6f\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x65\x69\x3d\ -\x75\x74\x66\x2d\x38\x26\x61\x6d\x70\x3b\x66\x72\x3d\x73\x66\x70\ -\x26\x61\x6d\x70\x3b\x69\x73\x63\x71\x72\x79\x3d\x26\x61\x6d\x70\ -\x3b\x70\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x66\x66\x2e\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\x6f\ -\x2e\x63\x6f\x6d\x2f\x67\x6f\x73\x73\x69\x70\x3f\x6f\x75\x74\x70\ -\x75\x74\x3d\x66\x78\x6a\x73\x6f\x6e\x26\x61\x6d\x70\x3b\x63\x6f\ -\x6d\x6d\x61\x6e\x64\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ -\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ -\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x6d\x2e\x77\x77\x77\x2e\x79\ -\x61\x68\x6f\x6f\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\ -\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\ -\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x7e\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x74\x69\x6f\ +\x6e\x61\x72\x79\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x57\x69\x6b\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\ +\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ +\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ +\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ +\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\ +\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x77\x2f\x69\x6e\ +\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\ +\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\ +\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ +\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\ +\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\x69\ +\x6b\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x66\x61\x76\ +\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ +\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\xc9\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -94,24 +137,29 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x46\x61\x63\x65\x62\x6f\ -\x6f\x6b\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\ -\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\ -\x53\x65\x61\x72\x63\x68\x20\x46\x61\x63\x65\x62\x6f\x6f\x6b\x3c\ -\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ -\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ -\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ -\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ -\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\ -\x6f\x6b\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\x73\ -\x72\x63\x3d\x6f\x73\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ -\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\ -\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\ -\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\x6f\x6b\x2e\x63\x6f\x6d\x2f\ -\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\ -\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x6f\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x69\x6e\x75\x78\x2d\ +\x4d\x61\x67\x61\x7a\x69\x6e\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\ +\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x53\x75\x63\x68\x65\x20\x61\x75\x66\x20\x77\ +\x77\x77\x2e\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\ +\x2e\x64\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ +\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ +\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ +\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ +\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x6c\x69\ +\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\x2f\x63\ +\x6f\x6e\x74\x65\x6e\x74\x2f\x73\x65\x61\x72\x63\x68\x3f\x53\x65\ +\x61\x72\x63\x68\x54\x65\x78\x74\x3d\x7b\x73\x65\x61\x72\x63\x68\ +\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ +\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\ +\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\ +\x2f\x65\x78\x74\x65\x6e\x73\x69\x6f\x6e\x2f\x6c\x6e\x6d\x2f\x64\ +\x65\x73\x69\x67\x6e\x2f\x6c\x69\x6e\x75\x78\x5f\x6d\x61\x67\x61\ +\x7a\x69\x6e\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\x69\x63\ +\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ +\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ +\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x95\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -120,22 +168,25 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x52\x65\x64\x64\x69\x74\ -\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ -\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x52\x65\ -\x64\x64\x69\x74\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\ -\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\ -\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\ -\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\ -\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\ -\x74\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x71\x3d\x7b\ -\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\ -\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\x74\x2e\x63\x6f\x6d\ -\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\ -\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x41\x6d\x61\x7a\x6f\x6e\ +\x2e\x63\x6f\x6d\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x41\x6d\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x20\x53\x65\x61\ +\x72\x63\x68\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ +\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ +\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ +\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ +\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\ +\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x2f\x65\x78\x65\x63\x2f\x6f\x62\ +\x69\x64\x6f\x73\x2f\x65\x78\x74\x65\x72\x6e\x61\x6c\x2d\x73\x65\ +\x61\x72\x63\x68\x2f\x3f\x66\x69\x65\x6c\x64\x2d\x6b\x65\x79\x77\ +\x6f\x72\x64\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ +\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ +\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\x61\x7a\ +\x6f\x6e\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ +\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ +\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ +\x6f\x6e\x3e\x0a\ \x00\x00\x02\x7a\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -178,7 +229,7 @@ \x6e\x64\x65\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\ \x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\ \x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x54\ +\x00\x00\x01\x85\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -187,37 +238,60 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x3c\ -\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\ -\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x57\x69\x6b\ -\x69\x61\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ -\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ -\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ -\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ -\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x69\x6e\x64\x65\x78\x2e\x70\ -\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\x65\x63\x69\x61\x6c\ -\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ -\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ -\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ -\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ -\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ -\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ -\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ -\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\x69\x61\ -\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\ -\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\ -\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\ -\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\ -\x73\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ -\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\x6d\x61\ -\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x77\x69\ -\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\x65\x73\ -\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\ -\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ -\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x0a\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x6f\x75\x54\x75\x62\ +\x65\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\ +\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\ +\x6f\x75\x54\x75\x62\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ +\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ +\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ +\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ +\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ +\x2e\x79\x6f\x75\x74\x75\x62\x65\x2e\x63\x6f\x6d\x2f\x72\x65\x73\ +\x75\x6c\x74\x73\x3f\x73\x65\x61\x72\x63\x68\x5f\x71\x75\x65\x72\ +\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\ +\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x53\x65\x61\x72\x63\ +\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x79\x6f\x75\x74\x75\ +\x62\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ +\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ +\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ +\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x1e\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x44\x65\x2d\x45\x6e\x20\ +\x42\x65\x6f\x6c\x69\x6e\x67\x75\x73\x3c\x2f\x53\x68\x6f\x72\x74\ +\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\ +\x69\x70\x74\x69\x6f\x6e\x3e\x42\x65\x6f\x6c\x69\x6e\x67\x75\x73\ +\x3a\x20\x47\x65\x72\x6d\x61\x6e\x2d\x45\x6e\x67\x6c\x69\x73\x68\ +\x20\x44\x69\x63\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\x73\ +\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ +\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ +\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ +\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ +\x2f\x2f\x64\x69\x63\x74\x2e\x74\x75\x2d\x63\x68\x65\x6d\x6e\x69\ +\x74\x7a\x2e\x64\x65\x2f\x3f\x71\x75\x65\x72\x79\x3d\x7b\x73\x65\ +\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\ +\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ +\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\ +\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\ +\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\ +\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\ +\x74\x75\x2d\x63\x68\x65\x6d\x6e\x69\x74\x7a\x2e\x64\x65\x2f\x73\ +\x75\x67\x67\x2e\x70\x68\x70\x3f\x6a\x73\x6f\x6e\x3d\x31\x26\x61\ +\x6d\x70\x3b\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ +\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ +\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\x74\x75\x2d\ +\x63\x68\x65\x6d\x6e\x69\x74\x7a\x2e\x64\x65\x2f\x70\x69\x63\x73\ +\x2f\x62\x65\x6f\x2d\x64\x65\x2e\x70\x6e\x67\x3c\x2f\x49\x6d\x61\ +\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ \x00\x00\x06\xfe\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -332,45 +406,6 @@ \x55\x35\x45\x72\x6b\x4a\x67\x67\x67\x3d\x3d\x3c\x2f\x49\x6d\x61\ \x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ \x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x02\x46\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x47\x6f\x6f\x67\x6c\x65\ -\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ -\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x47\x6f\ -\x6f\x67\x6c\x65\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\ -\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ -\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ -\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ -\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ -\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\x6f\x67\x6c\x65\ -\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x68\x6c\x3d\x7b\ -\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\x61\x6d\x70\x3b\x6c\x72\ -\x3d\x6c\x61\x6e\x67\x5f\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\ -\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\ -\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\ -\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\ -\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\ -\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\ -\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ -\x74\x70\x3a\x2f\x2f\x73\x75\x67\x67\x65\x73\x74\x71\x75\x65\x72\ -\x69\x65\x73\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x63\ -\x6f\x6d\x70\x6c\x65\x74\x65\x2f\x73\x65\x61\x72\x63\x68\x3f\x6f\ -\x75\x74\x70\x75\x74\x3d\x66\x69\x72\x65\x66\x6f\x78\x26\x61\x6d\ -\x70\x3b\x68\x6c\x3d\x7b\x6c\x61\x6e\x67\x75\x61\x67\x65\x7d\x26\ -\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ -\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ -\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x67\x6f\x6f\ -\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\ -\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ -\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ -\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x64\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -412,71 +447,7 @@ \x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ \x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ \x6e\x3e\x0a\ -\x00\x00\x02\x1e\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x44\x65\x2d\x45\x6e\x20\ -\x42\x65\x6f\x6c\x69\x6e\x67\x75\x73\x3c\x2f\x53\x68\x6f\x72\x74\ -\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\ -\x69\x70\x74\x69\x6f\x6e\x3e\x42\x65\x6f\x6c\x69\x6e\x67\x75\x73\ -\x3a\x20\x47\x65\x72\x6d\x61\x6e\x2d\x45\x6e\x67\x6c\x69\x73\x68\ -\x20\x44\x69\x63\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ -\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ -\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ -\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x64\x69\x63\x74\x2e\x74\x75\x2d\x63\x68\x65\x6d\x6e\x69\ -\x74\x7a\x2e\x64\x65\x2f\x3f\x71\x75\x65\x72\x79\x3d\x7b\x73\x65\ -\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\ -\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ -\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\ -\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\ -\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\ -\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\ -\x74\x75\x2d\x63\x68\x65\x6d\x6e\x69\x74\x7a\x2e\x64\x65\x2f\x73\ -\x75\x67\x67\x2e\x70\x68\x70\x3f\x6a\x73\x6f\x6e\x3d\x31\x26\x61\ -\x6d\x70\x3b\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ -\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ -\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x64\x69\x63\x74\x2e\x74\x75\x2d\ -\x63\x68\x65\x6d\x6e\x69\x74\x7a\x2e\x64\x65\x2f\x70\x69\x63\x73\ -\x2f\x62\x65\x6f\x2d\x64\x65\x2e\x70\x6e\x67\x3c\x2f\x49\x6d\x61\ -\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x9b\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x74\x69\x6f\ -\x6e\x61\x72\x79\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ -\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x57\x69\x6b\x74\x69\x6f\x6e\x61\x72\x79\x3c\x2f\x44\x65\ -\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ -\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ -\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ -\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ -\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\ -\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x77\x2f\x69\x6e\ -\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\ -\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\ -\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\ -\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\ -\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x65\x6e\x2e\x77\x69\ -\x6b\x74\x69\x6f\x6e\x61\x72\x79\x2e\x6f\x72\x67\x2f\x66\x61\x76\ -\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ -\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\xc9\ +\x00\x00\x02\x46\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -485,82 +456,36 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x4c\x69\x6e\x75\x78\x2d\ -\x4d\x61\x67\x61\x7a\x69\x6e\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\ -\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\ -\x74\x69\x6f\x6e\x3e\x53\x75\x63\x68\x65\x20\x61\x75\x66\x20\x77\ -\x77\x77\x2e\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\ -\x2e\x64\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ -\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ -\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ -\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ -\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x6c\x69\ -\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\x2f\x63\ -\x6f\x6e\x74\x65\x6e\x74\x2f\x73\x65\x61\x72\x63\x68\x3f\x53\x65\ -\x61\x72\x63\x68\x54\x65\x78\x74\x3d\x7b\x73\x65\x61\x72\x63\x68\ -\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\ -\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\ -\x6c\x69\x6e\x75\x78\x2d\x6d\x61\x67\x61\x7a\x69\x6e\x2e\x64\x65\ -\x2f\x65\x78\x74\x65\x6e\x73\x69\x6f\x6e\x2f\x6c\x6e\x6d\x2f\x64\ -\x65\x73\x69\x67\x6e\x2f\x6c\x69\x6e\x75\x78\x5f\x6d\x61\x67\x61\ -\x7a\x69\x6e\x2f\x69\x6d\x61\x67\x65\x73\x2f\x66\x61\x76\x69\x63\ -\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ -\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ -\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x95\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x41\x6d\x61\x7a\x6f\x6e\ -\x2e\x63\x6f\x6d\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x20\ +\x28\x65\x6e\x29\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\ \x0a\x20\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ -\x6e\x3e\x41\x6d\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x20\x53\x65\x61\ -\x72\x63\x68\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\ -\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\ -\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\ -\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\ -\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\ -\x61\x7a\x6f\x6e\x2e\x63\x6f\x6d\x2f\x65\x78\x65\x63\x2f\x6f\x62\ -\x69\x64\x6f\x73\x2f\x65\x78\x74\x65\x72\x6e\x61\x6c\x2d\x73\x65\ -\x61\x72\x63\x68\x2f\x3f\x66\x69\x65\x6c\x64\x2d\x6b\x65\x79\x77\ -\x6f\x72\x64\x73\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\ -\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\ -\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x61\x6d\x61\x7a\ -\x6f\x6e\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ -\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ -\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ -\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x79\ -\x3c\ -\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ -\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ -\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ -\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ -\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ -\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ -\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x42\x69\x6e\x67\x3c\x2f\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\x3c\ -\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x42\x69\x6e\x67\ -\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\x44\x65\x73\ -\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\ -\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\ -\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\ -\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\ -\x2f\x2f\x77\x77\x77\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\ -\x65\x61\x72\x63\x68\x3f\x63\x63\x3d\x7b\x6c\x61\x6e\x67\x75\x61\ -\x67\x65\x7d\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\x72\x63\ -\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ -\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ -\x2e\x62\x69\x6e\x67\x2e\x63\x6f\x6d\x2f\x73\x2f\x77\x6c\x66\x6c\ -\x61\x67\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\ -\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\ -\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x6e\x3e\x57\x69\x6b\x69\x61\x20\x28\x65\x6e\x29\x3c\x2f\x44\x65\ +\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\ +\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\ +\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\ +\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\ +\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\ +\x2f\x69\x6e\x64\x65\x78\x2e\x70\x68\x70\x3f\x74\x69\x74\x6c\x65\ +\x3d\x53\x70\x65\x63\x69\x61\x6c\x3a\x53\x65\x61\x72\x63\x68\x26\ +\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\ +\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\ +\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\ +\x22\x20\x74\x79\x70\x65\x3d\x22\x61\x70\x70\x6c\x69\x63\x61\x74\ +\x69\x6f\x6e\x2f\x78\x2d\x73\x75\x67\x67\x65\x73\x74\x69\x6f\x6e\ +\x73\x2b\x6a\x73\x6f\x6e\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\ +\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x69\x6b\ +\x69\x61\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\ +\x63\x74\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\ +\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\ +\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\ +\x6d\x65\x73\x70\x61\x63\x65\x3d\x31\x22\x2f\x3e\x0a\x20\x20\x20\ +\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\ +\x6d\x61\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\ +\x77\x69\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\ +\x65\x73\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\ +\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\ +\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\ +\x69\x6f\x6e\x3e\x0a\ \x00\x00\x02\x5b\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ @@ -601,7 +526,69 @@ \x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\ \x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\ \x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ -\x00\x00\x01\x85\ +\x00\x00\x01\x6f\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x52\x65\x64\x64\x69\x74\ +\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ +\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x52\x65\ +\x64\x64\x69\x74\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\ +\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\ +\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\ +\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\ +\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\ +\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\ +\x74\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x71\x3d\x7b\ +\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\ +\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\ +\x2f\x2f\x77\x77\x77\x2e\x72\x65\x64\x64\x69\x74\x2e\x63\x6f\x6d\ +\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\ +\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x27\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x61\x68\x6f\x6f\x21\ +\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\ +\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\x61\ +\x68\x6f\x6f\x20\x57\x65\x62\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\ +\x6f\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x3f\x65\x69\x3d\ +\x75\x74\x66\x2d\x38\x26\x61\x6d\x70\x3b\x66\x72\x3d\x73\x66\x70\ +\x26\x61\x6d\x70\x3b\x69\x73\x63\x71\x72\x79\x3d\x26\x61\x6d\x70\ +\x3b\x70\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x66\x66\x2e\x73\x65\x61\x72\x63\x68\x2e\x79\x61\x68\x6f\x6f\ +\x2e\x63\x6f\x6d\x2f\x67\x6f\x73\x73\x69\x70\x3f\x6f\x75\x74\x70\ +\x75\x74\x3d\x66\x78\x6a\x73\x6f\x6e\x26\x61\x6d\x70\x3b\x63\x6f\ +\x6d\x6d\x61\x6e\x64\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\ +\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\ +\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x6d\x2e\x77\x77\x77\x2e\x79\ +\x61\x68\x6f\x6f\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\ +\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\ +\x70\x65\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\ +\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x01\x7e\ \x3c\ \x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ \x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ @@ -610,69 +597,78 @@ \x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ \x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ \x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ -\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x59\x6f\x75\x54\x75\x62\ -\x65\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\ -\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x59\ -\x6f\x75\x54\x75\x62\x65\x3c\x2f\x44\x65\x73\x63\x72\x69\x70\x74\ -\x69\x6f\x6e\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\ -\x74\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\ -\x22\x74\x65\x78\x74\x2f\x68\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\ -\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\ -\x2e\x79\x6f\x75\x74\x75\x62\x65\x2e\x63\x6f\x6d\x2f\x72\x65\x73\ -\x75\x6c\x74\x73\x3f\x73\x65\x61\x72\x63\x68\x5f\x71\x75\x65\x72\ -\x79\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x26\ -\x61\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x53\x65\x61\x72\x63\ -\x68\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x49\x6d\x61\x67\x65\x3e\ -\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x79\x6f\x75\x74\x75\ -\x62\x65\x2e\x63\x6f\x6d\x2f\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\ -\x63\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\ -\x6e\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\ -\x6f\x6e\x3e\x0a\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x46\x61\x63\x65\x62\x6f\ +\x6f\x6b\x3c\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\ +\x20\x20\x20\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\ +\x53\x65\x61\x72\x63\x68\x20\x46\x61\x63\x65\x62\x6f\x6f\x6b\x3c\ +\x2f\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\ +\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\ +\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\ +\x74\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\ +\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\ +\x6f\x6b\x2e\x63\x6f\x6d\x2f\x73\x65\x61\x72\x63\x68\x2f\x3f\x73\ +\x72\x63\x3d\x6f\x73\x26\x61\x6d\x70\x3b\x71\x3d\x7b\x73\x65\x61\ +\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\x22\x2f\x3e\x0a\x20\x20\x20\ +\x20\x3c\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x77\ +\x77\x77\x2e\x66\x61\x63\x65\x62\x6f\x6f\x6b\x2e\x63\x6f\x6d\x2f\ +\x66\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\x6f\x3c\x2f\x49\x6d\x61\ +\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\x68\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\ +\x00\x00\x02\x54\ +\x3c\ +\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\ +\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x55\x54\x46\ +\x2d\x38\x22\x3f\x3e\x0a\x3c\x4f\x70\x65\x6e\x53\x65\x61\x72\x63\ +\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x20\x78\x6d\x6c\ +\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x61\x39\x2e\x63\x6f\ +\x6d\x2f\x2d\x2f\x73\x70\x65\x63\x2f\x6f\x70\x65\x6e\x73\x65\x61\ +\x72\x63\x68\x2f\x31\x2e\x31\x2f\x22\x3e\x0a\x20\x20\x20\x20\x3c\ +\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x57\x69\x6b\x69\x61\x3c\ +\x2f\x53\x68\x6f\x72\x74\x4e\x61\x6d\x65\x3e\x0a\x20\x20\x20\x20\ +\x3c\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x57\x69\x6b\ +\x69\x61\x20\x53\x69\x74\x65\x20\x53\x65\x61\x72\x63\x68\x3c\x2f\ +\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\x6e\x3e\x0a\x20\x20\x20\ +\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\x68\x6f\x64\x3d\x22\x67\x65\ +\x74\x22\x20\x74\x79\x70\x65\x3d\x22\x74\x65\x78\x74\x2f\x68\x74\ +\x6d\x6c\x22\x20\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\ +\x74\x70\x3a\x2f\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\ +\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x69\x6e\x64\x65\x78\x2e\x70\ +\x68\x70\x3f\x74\x69\x74\x6c\x65\x3d\x53\x70\x65\x63\x69\x61\x6c\ +\x3a\x53\x65\x61\x72\x63\x68\x26\x61\x6d\x70\x3b\x73\x65\x61\x72\ +\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\x68\x54\x65\x72\x6d\x73\x7d\ +\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\x55\x72\x6c\x20\x6d\x65\x74\ +\x68\x6f\x64\x3d\x22\x67\x65\x74\x22\x20\x74\x79\x70\x65\x3d\x22\ +\x61\x70\x70\x6c\x69\x63\x61\x74\x69\x6f\x6e\x2f\x78\x2d\x73\x75\ +\x67\x67\x65\x73\x74\x69\x6f\x6e\x73\x2b\x6a\x73\x6f\x6e\x22\x20\ +\x74\x65\x6d\x70\x6c\x61\x74\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\ +\x2f\x7b\x63\x6f\x75\x6e\x74\x72\x79\x7d\x2e\x77\x69\x6b\x69\x61\ +\x2e\x63\x6f\x6d\x2f\x61\x70\x69\x2e\x70\x68\x70\x3f\x61\x63\x74\ +\x69\x6f\x6e\x3d\x6f\x70\x65\x6e\x73\x65\x61\x72\x63\x68\x26\x61\ +\x6d\x70\x3b\x73\x65\x61\x72\x63\x68\x3d\x7b\x73\x65\x61\x72\x63\ +\x68\x54\x65\x72\x6d\x73\x7d\x26\x61\x6d\x70\x3b\x6e\x61\x6d\x65\ +\x73\x70\x61\x63\x65\x3d\x30\x22\x2f\x3e\x0a\x20\x20\x20\x20\x3c\ +\x49\x6d\x61\x67\x65\x3e\x68\x74\x74\x70\x3a\x2f\x2f\x69\x6d\x61\ +\x67\x65\x73\x2e\x77\x69\x6b\x69\x61\x2e\x63\x6f\x6d\x2f\x77\x69\ +\x6b\x69\x61\x67\x6c\x6f\x62\x61\x6c\x2f\x69\x6d\x61\x67\x65\x73\ +\x2f\x36\x2f\x36\x34\x2f\x46\x61\x76\x69\x63\x6f\x6e\x2e\x69\x63\ +\x6f\x3c\x2f\x49\x6d\x61\x67\x65\x3e\x0a\x3c\x2f\x4f\x70\x65\x6e\ +\x53\x65\x61\x72\x63\x68\x44\x65\x73\x63\x72\x69\x70\x74\x69\x6f\ +\x6e\x3e\x0a\ " qt_resource_name = b"\ -\x00\x0c\ -\x0e\x81\x61\xdc\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x5f\x00\x65\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x09\ -\x0f\x62\xe1\xdc\ -\x00\x59\ -\x00\x61\x00\x68\x00\x6f\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0c\ -\x0f\xd5\x68\x1c\ -\x00\x46\ -\x00\x61\x00\x63\x00\x65\x00\x62\x00\x6f\x00\x6f\x00\x6b\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0a\ -\x0b\x0c\x48\x7c\ -\x00\x52\ -\x00\x65\x00\x64\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0e\ -\x00\xf1\x12\x1c\ -\x00\x4c\ -\x00\x45\x00\x4f\x00\x5f\x00\x44\x00\x65\x00\x75\x00\x45\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x09\ -\x01\xf4\xe3\x3c\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0e\ -\x09\x21\x3a\xfc\ -\x00\x44\ -\x00\x75\x00\x63\x00\x6b\x00\x44\x00\x75\x00\x63\x00\x6b\x00\x47\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x08\ +\x00\x4a\x56\x1c\ +\x00\x42\ +\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0a\ \x0e\x31\x93\x9c\ \x00\x47\ \x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x1b\ -\x0d\x52\x43\x5c\ -\x00\x47\ -\x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x5f\x00\x49\x00\x6d\x00\x5f\x00\x46\x00\x65\x00\x65\x00\x6c\x00\x69\x00\x6e\x00\x67\ -\x00\x5f\x00\x4c\x00\x75\x00\x63\x00\x6b\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x12\ -\x0a\xf9\x0f\x7c\ -\x00\x44\ -\x00\x65\x00\x45\x00\x6e\x00\x5f\x00\x42\x00\x65\x00\x6f\x00\x6c\x00\x69\x00\x6e\x00\x67\x00\x75\x00\x73\x00\x2e\x00\x78\x00\x6d\ -\x00\x6c\ +\x00\x08\ +\x0e\x4c\x55\xdc\ +\x00\x50\ +\x00\x79\x00\x50\x00\x49\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0e\ \x08\xce\x7c\x3c\ \x00\x57\ @@ -685,74 +681,111 @@ \x0a\x2e\x72\x9c\ \x00\x41\ \x00\x6d\x00\x61\x00\x7a\x00\x6f\x00\x6e\x00\x63\x00\x6f\x00\x6d\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x08\ -\x00\x4a\x56\x1c\ -\x00\x42\ -\x00\x69\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ -\x00\x0d\ -\x06\xf8\x53\x3c\ -\x00\x57\ -\x00\x69\x00\x6b\x00\x69\x00\x70\x00\x65\x00\x64\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0e\ +\x00\xf1\x12\x1c\ +\x00\x4c\ +\x00\x45\x00\x4f\x00\x5f\x00\x44\x00\x65\x00\x75\x00\x45\x00\x6e\x00\x67\x00\x2e\x00\x78\x00\x6d\x00\x6c\ \x00\x0b\ \x0b\x48\x8a\x5c\ \x00\x59\ \x00\x6f\x00\x75\x00\x54\x00\x75\x00\x62\x00\x65\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x12\ +\x0a\xf9\x0f\x7c\ +\x00\x44\ +\x00\x65\x00\x45\x00\x6e\x00\x5f\x00\x42\x00\x65\x00\x6f\x00\x6c\x00\x69\x00\x6e\x00\x67\x00\x75\x00\x73\x00\x2e\x00\x78\x00\x6d\ +\x00\x6c\ +\x00\x0e\ +\x09\x21\x3a\xfc\ +\x00\x44\ +\x00\x75\x00\x63\x00\x6b\x00\x44\x00\x75\x00\x63\x00\x6b\x00\x47\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x1b\ +\x0d\x52\x43\x5c\ +\x00\x47\ +\x00\x6f\x00\x6f\x00\x67\x00\x6c\x00\x65\x00\x5f\x00\x49\x00\x6d\x00\x5f\x00\x46\x00\x65\x00\x65\x00\x6c\x00\x69\x00\x6e\x00\x67\ +\x00\x5f\x00\x4c\x00\x75\x00\x63\x00\x6b\x00\x79\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0c\ +\x0e\x81\x61\xdc\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x5f\x00\x65\x00\x6e\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0d\ +\x06\xf8\x53\x3c\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x69\x00\x70\x00\x65\x00\x64\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0a\ +\x0b\x0c\x48\x7c\ +\x00\x52\ +\x00\x65\x00\x64\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x09\ +\x0f\x62\xe1\xdc\ +\x00\x59\ +\x00\x61\x00\x68\x00\x6f\x00\x6f\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x0c\ +\x0f\xd5\x68\x1c\ +\x00\x46\ +\x00\x61\x00\x63\x00\x65\x00\x62\x00\x6f\x00\x6f\x00\x6b\x00\x2e\x00\x78\x00\x6d\x00\x6c\ +\x00\x09\ +\x01\xf4\xe3\x3c\ +\x00\x57\ +\x00\x69\x00\x6b\x00\x69\x00\x61\x00\x2e\x00\x78\x00\x6d\x00\x6c\ " qt_resource_struct_v1 = b"\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x10\x00\x00\x00\x01\ -\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x1b\ -\x00\x00\x00\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x07\x6a\ -\x00\x00\x00\x90\x00\x00\x00\x00\x00\x01\x00\x00\x09\xe8\ -\x00\x00\x01\xc8\x00\x00\x00\x00\x00\x01\x00\x00\x20\x98\ -\x00\x00\x01\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x16\ -\x00\x00\x00\xa8\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x40\ -\x00\x00\x01\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x1b\xb5\ -\x00\x00\x01\x92\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x82\ -\x00\x00\x01\x20\x00\x00\x00\x00\x00\x01\x00\x00\x17\xf4\ -\x00\x00\x00\x54\x00\x00\x00\x00\x00\x01\x00\x00\x05\xf7\ -\x00\x00\x01\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x22\xf7\ -\x00\x00\x00\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x15\x8c\ -\x00\x00\x00\xca\x00\x00\x00\x00\x00\x01\x00\x00\x13\x42\ +\x00\x00\x00\x00\x00\x02\x00\x00\x00\x11\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ -\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x02\x4a\ -\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x04\x75\ +\x00\x00\x00\xae\x00\x00\x00\x00\x00\x01\x00\x00\x0a\x44\ +\x00\x00\x02\x02\x00\x00\x00\x00\x00\x01\x00\x00\x23\xa0\ +\x00\x00\x01\x92\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x21\ +\x00\x00\x00\x46\x00\x00\x00\x00\x00\x01\x00\x00\x05\x3f\ +\x00\x00\x01\x16\x00\x00\x00\x00\x00\x01\x00\x00\x10\x6d\ +\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x06\xde\ +\x00\x00\x00\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x08\xab\ +\x00\x00\x00\xec\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x4b\ +\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x1e\x80\ +\x00\x00\x00\xd0\x00\x00\x00\x00\x00\x01\x00\x00\x0c\xc2\ +\x00\x00\x01\x38\x00\x00\x00\x00\x00\x01\x00\x00\x17\x6f\ +\x00\x00\x00\x16\x00\x00\x00\x00\x00\x01\x00\x00\x01\x7d\ +\x00\x00\x00\x30\x00\x00\x00\x00\x00\x01\x00\x00\x03\xc7\ +\x00\x00\x01\x74\x00\x00\x00\x00\x00\x01\x00\x00\x19\xd7\ +\x00\x00\x01\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x1f\xf3\ +\x00\x00\x01\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x22\x1e\ " qt_resource_struct_v2 = b"\ -\x00\x00\x00\x00\x00\x02\x00\x00\x00\x10\x00\x00\x00\x01\ +\x00\x00\x00\x00\x00\x02\x00\x00\x00\x11\x00\x00\x00\x01\ \x00\x00\x00\x00\x00\x00\x00\x00\ -\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x1f\x1b\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x00\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x07\x6a\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x00\x90\x00\x00\x00\x00\x00\x01\x00\x00\x09\xe8\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x01\xc8\x00\x00\x00\x00\x00\x01\x00\x00\x20\x98\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x01\x4a\x00\x00\x00\x00\x00\x01\x00\x00\x1a\x16\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x00\xa8\x00\x00\x00\x00\x00\x01\x00\x00\x0c\x40\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x01\x6c\x00\x00\x00\x00\x00\x01\x00\x00\x1b\xb5\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x01\x92\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x82\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x01\x20\x00\x00\x00\x00\x00\x01\x00\x00\x17\xf4\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x00\x54\x00\x00\x00\x00\x00\x01\x00\x00\x05\xf7\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x01\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x22\xf7\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x00\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x15\x8c\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x00\xca\x00\x00\x00\x00\x00\x01\x00\x00\x13\x42\ -\x00\x00\x01\x53\xdc\x87\x12\xa8\ \x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\ \x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x02\x4a\ +\x00\x00\x00\xae\x00\x00\x00\x00\x00\x01\x00\x00\x0a\x44\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x02\x02\x00\x00\x00\x00\x00\x01\x00\x00\x23\xa0\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x01\x92\x00\x00\x00\x00\x00\x01\x00\x00\x1c\x21\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x00\x46\x00\x00\x00\x00\x00\x01\x00\x00\x05\x3f\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x01\x16\x00\x00\x00\x00\x00\x01\x00\x00\x10\x6d\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x00\x68\x00\x00\x00\x00\x00\x01\x00\x00\x06\xde\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x00\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x08\xab\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x00\xec\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x4b\ \x00\x00\x01\x53\xdc\x87\x12\xa8\ -\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x04\x75\ +\x00\x00\x01\xb2\x00\x00\x00\x00\x00\x01\x00\x00\x1e\x80\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x00\xd0\x00\x00\x00\x00\x00\x01\x00\x00\x0c\xc2\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x01\x38\x00\x00\x00\x00\x00\x01\x00\x00\x17\x6f\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x00\x16\x00\x00\x00\x00\x00\x01\x00\x00\x01\x7d\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x00\x30\x00\x00\x00\x00\x00\x01\x00\x00\x03\xc7\ +\x00\x00\x01\x62\xd4\x92\x04\x90\ +\x00\x00\x01\x74\x00\x00\x00\x00\x00\x01\x00\x00\x19\xd7\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x01\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x1f\xf3\ +\x00\x00\x01\x53\xdc\x87\x12\xa8\ +\x00\x00\x01\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x22\x1e\ \x00\x00\x01\x53\xdc\x87\x12\xa8\ "
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/WebBrowser/OpenSearch/DefaultSearchEngines/PyPI.xml Tue Apr 17 19:11:51 2018 +0200 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>PyPI</ShortName> + <Description>Search PyPI</Description> + <Url method="get" type="text/html" template="https://pypi.org/search/?q={searchTerms}"/> + <Image>https://pypi.org/static/images/favicon.6a76275d.ico</Image> +</OpenSearchDescription>
--- a/eric6.e4p Sun Apr 15 10:50:50 2018 +0200 +++ b/eric6.e4p Tue Apr 17 19:11:51 2018 +0200 @@ -2236,6 +2236,7 @@ <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Google_Im_Feeling_Lucky.xml</Other> <Other>Helpviewer/OpenSearch/DefaultSearchEngines/LEO_DeuEng.xml</Other> <Other>Helpviewer/OpenSearch/DefaultSearchEngines/LinuxMagazin.xml</Other> + <Other>Helpviewer/OpenSearch/DefaultSearchEngines/PyPI.xml</Other> <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Reddit.xml</Other> <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Wikia.xml</Other> <Other>Helpviewer/OpenSearch/DefaultSearchEngines/Wikia_en.xml</Other> @@ -2376,6 +2377,7 @@ <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Google_Im_Feeling_Lucky.xml</Other> <Other>WebBrowser/OpenSearch/DefaultSearchEngines/LEO_DeuEng.xml</Other> <Other>WebBrowser/OpenSearch/DefaultSearchEngines/LinuxMagazin.xml</Other> + <Other>WebBrowser/OpenSearch/DefaultSearchEngines/PyPI.xml</Other> <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Reddit.xml</Other> <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Wikia.xml</Other> <Other>WebBrowser/OpenSearch/DefaultSearchEngines/Wikia_en.xml</Other>
