##// END OF EJS Templates
Fix naming convention to PEP 8.
Fernando Perez -
Show More
@@ -15,7 +15,6 b' Limitations:'
15 won't even have these special _NN variables set at all.
15 won't even have these special _NN variables set at all.
16 """
16 """
17
17
18
19 #-----------------------------------------------------------------------------
18 #-----------------------------------------------------------------------------
20 # Module imports
19 # Module imports
21
20
@@ -854,7 +853,7 b' class IPythonDoctest(ExtensionDoctest):'
854 "have either doctests or non-doctest tests, "
853 "have either doctests or non-doctest tests, "
855 "not both. [NOSE_IPDOCTEST_TESTS]")
854 "not both. [NOSE_IPDOCTEST_TESTS]")
856 parser.add_option('--ipdoctest-extension', action="append",
855 parser.add_option('--ipdoctest-extension', action="append",
857 dest="ipdoctestExtension",
856 dest="ipdoctest_extension",
858 help="Also look for doctests in files with "
857 help="Also look for doctests in files with "
859 "this extension [NOSE_IPDOCTEST_EXTENSION]")
858 "this extension [NOSE_IPDOCTEST_EXTENSION]")
860 # Set the default as a list, if given in env; otherwise
859 # Set the default as a list, if given in env; otherwise
@@ -862,16 +861,15 b' class IPythonDoctest(ExtensionDoctest):'
862 # an error.
861 # an error.
863 env_setting = env.get('NOSE_IPDOCTEST_EXTENSION')
862 env_setting = env.get('NOSE_IPDOCTEST_EXTENSION')
864 if env_setting is not None:
863 if env_setting is not None:
865 parser.set_defaults(ipdoctestExtension=tolist(env_setting))
864 parser.set_defaults(ipdoctest_extension=tolist(env_setting))
866
865
867 def configure(self, options, config):
866 def configure(self, options, config):
868 Plugin.configure(self, options, config)
867 Plugin.configure(self, options, config)
869 self.doctest_tests = options.ipdoctest_tests
868 self.doctest_tests = options.ipdoctest_tests
870 self.extension = tolist(options.ipdoctestExtension)
869 self.extension = tolist(options.ipdoctest_extension)
871
870
872 self.parser = IPDocTestParser()
871 self.parser = IPDocTestParser()
873 self.finder = DocTestFinder(parser=self.parser)
872 self.finder = DocTestFinder(parser=self.parser)
874 self.checker = IPDoctestOutputChecker()
873 self.checker = IPDoctestOutputChecker()
875 self.globs = None
874 self.globs = None
876 self.extraglobs = None
875 self.extraglobs = None
877
General Comments 0
You need to be logged in to leave comments. Login now