Pywikibot-commits January 2015

pywikibot-commits@lists.wikimedia.org

3 participants
206 discussions

[Gerrit] [IMPROV] ui tests: deindent source code - change (pywikibot/core)
by jenkins-bot (Code Review) 26 Jan '15

26 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [IMPROV] ui tests: deindent source code ...................................................................... [IMPROV] ui tests: deindent source code With 03477f98e54ff2b91cc1938abb3742cee215fa59 the ui_tests now run outside of __name__ == __main__'. To have the number of changes minimal it didn't deindent the source code but just changed the if-condition to be always True. Change-Id: I2ab67f422a1d9df1da1ae0523f3f163577c416c1 --- M tests/ui_tests.py 1 file changed, 372 insertions(+), 359 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 365b329..9229769 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -129,476 +129,489 @@ return strin._stream.readline().strip() -# TODO: This complete section doesn't depend on __name__ == '__main__' anymore -if True: - patched_streams = {} - strout = Stream('out', patched_streams) - strerr = Stream('err', patched_streams) - strin = Stream('in', {}) +patched_streams = {} +strout = Stream('out', patched_streams) +strerr = Stream('err', patched_streams) +strin = Stream('in', {}) - newstdout = strout._stream - newstderr = strerr._stream - newstdin = strin._stream +newstdout = strout._stream +newstderr = strerr._stream +newstdin = strin._stream - org_print = ui._print - org_input = ui._raw_input +org_print = ui._print +org_input = ui._raw_input - def patch(): - """Patch standard terminal files.""" - strout.reset() - strerr.reset() - strin.reset() - ui._print = patched_print - ui._raw_input = patched_input - def unpatch(): - """un-patch standard terminal files.""" - ui._print = org_print - ui._raw_input = org_input +def patch(): + """Patch standard terminal files.""" + strout.reset() + strerr.reset() + strin.reset() + ui._print = patched_print + ui._raw_input = patched_input - logger = logging.getLogger('pywiki') - loggingcontext = {'caller_name': "ui_tests", - 'caller_file': "ui_tests", - 'caller_line': 0, - 'newline': "\n"} - class UITestCase(unittest.TestCase): +def unpatch(): + """un-patch standard terminal files.""" + ui._print = org_print + ui._raw_input = org_input - """UI tests.""" +logger = logging.getLogger('pywiki') +loggingcontext = {'caller_name': "ui_tests", + 'caller_file': "ui_tests", + 'caller_line': 0, + 'newline': "\n"} - net = False - def setUp(self): - patch() +class UITestCase(unittest.TestCase): - pywikibot.config.colorized_output = True - pywikibot.config.transliterate = False - pywikibot.ui.transliteration_target = None - pywikibot.ui.encoding = 'utf-8' + """UI tests.""" - def tearDown(self): - unpatch() + net = False - def _encode(self, string, encoding='utf-8'): - if sys.version_info[0] > 2: - return string - else: - return string.encode(encoding) + def setUp(self): + patch() - class TestTerminalOutput(UITestCase): + pywikibot.config.colorized_output = True + pywikibot.config.transliterate = False + pywikibot.ui.transliteration_target = None + pywikibot.ui.encoding = 'utf-8' - """Terminal output tests.""" + def tearDown(self): + unpatch() - def testOutputLevels_logging_debug(self): - logger.log(DEBUG, 'debug', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "") + def _encode(self, string, encoding='utf-8'): + if sys.version_info[0] > 2: + return string + else: + return string.encode(encoding) - def testOutputLevels_logging_verbose(self): - logger.log(VERBOSE, 'verbose', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "") - def testOutputLevels_logging_info(self): - logger.log(INFO, 'info', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "info\n") +class TestTerminalOutput(UITestCase): - def testOutputLevels_logging_stdout(self): - logger.log(STDOUT, 'stdout', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "stdout\n") - self.assertEqual(newstderr.getvalue(), "") + """Terminal output tests.""" - def testOutputLevels_logging_input(self): - logger.log(INPUT, 'input', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "input\n") + def testOutputLevels_logging_debug(self): + logger.log(DEBUG, 'debug', extra=loggingcontext) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "") - def testOutputLevels_logging_WARNING(self): - logger.log(WARNING, 'WARNING', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "WARNING: WARNING\n") + def testOutputLevels_logging_verbose(self): + logger.log(VERBOSE, 'verbose', extra=loggingcontext) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "") - def testOutputLevels_logging_ERROR(self): - logger.log(ERROR, 'ERROR', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "ERROR: ERROR\n") + def testOutputLevels_logging_info(self): + logger.log(INFO, 'info', extra=loggingcontext) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "info\n") - def testOutputLevels_logging_CRITICAL(self): - logger.log(CRITICAL, 'CRITICAL', extra=loggingcontext) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "CRITICAL: CRITICAL\n") + def testOutputLevels_logging_stdout(self): + logger.log(STDOUT, 'stdout', extra=loggingcontext) + self.assertEqual(newstdout.getvalue(), "stdout\n") + self.assertEqual(newstderr.getvalue(), "") - def test_output(self): - pywikibot.output("output", toStdout=False) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "output\n") + def testOutputLevels_logging_input(self): + logger.log(INPUT, 'input', extra=loggingcontext) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "input\n") - def test_output_stdout(self): - pywikibot.output("output", toStdout=True) - self.assertEqual(newstdout.getvalue(), "output\n") - self.assertEqual(newstderr.getvalue(), "") + def testOutputLevels_logging_WARNING(self): + logger.log(WARNING, 'WARNING', extra=loggingcontext) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "WARNING: WARNING\n") - def test_warning(self): - pywikibot.warning("warning") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "WARNING: warning\n") + def testOutputLevels_logging_ERROR(self): + logger.log(ERROR, 'ERROR', extra=loggingcontext) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "ERROR: ERROR\n") - def test_error(self): - pywikibot.error("error") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "ERROR: error\n") + def testOutputLevels_logging_CRITICAL(self): + logger.log(CRITICAL, 'CRITICAL', extra=loggingcontext) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "CRITICAL: CRITICAL\n") - def test_log(self): - pywikibot.log("log") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "") + def test_output(self): + pywikibot.output("output", toStdout=False) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "output\n") - def test_critical(self): - pywikibot.critical("critical") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "CRITICAL: critical\n") + def test_output_stdout(self): + pywikibot.output("output", toStdout=True) + self.assertEqual(newstdout.getvalue(), "output\n") + self.assertEqual(newstderr.getvalue(), "") - def test_debug(self): - pywikibot.debug("debug", "test") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "") + def test_warning(self): + pywikibot.warning("warning") + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "WARNING: warning\n") - def test_exception(self): - class TestException(Exception): - pass - try: - raise TestException("Testing Exception") - except TestException: - pywikibot.exception("exception") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "ERROR: TestException: Testing Exception\n") + def test_error(self): + pywikibot.error("error") + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "ERROR: error\n") - def test_exception_tb(self): - class TestException(Exception): - pass - try: - raise TestException("Testing Exception") - except TestException: - pywikibot.exception("exception", tb=True) - self.assertEqual(newstdout.getvalue(), "") - stderrlines = newstderr.getvalue().split("\n") - self.assertEqual(stderrlines[0], "ERROR: TestException: Testing Exception") - self.assertEqual(stderrlines[1], "Traceback (most recent call last):") - self.assertEqual(stderrlines[3], """ raise TestException("Testing Exception")""") - self.assertTrue(stderrlines[4].endswith(': Testing Exception')) + def test_log(self): + pywikibot.log("log") + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "") - self.assertNotEqual(stderrlines[-1], "\n") + def test_critical(self): + pywikibot.critical("critical") + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "CRITICAL: critical\n") - class TestTerminalInput(UITestCase): + def test_debug(self): + pywikibot.debug("debug", "test") + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "") - """Terminal input tests.""" + def test_exception(self): + class TestException(Exception): - input_choice_output = "question ([A]nswer 1, a[n]swer 2, an[s]wer 3) " + """Test Exception.""" - def testInput(self): - newstdin.write("input to read\n") - newstdin.seek(0) + try: + raise TestException("Testing Exception") + except TestException: + pywikibot.exception("exception") + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "ERROR: TestException: Testing Exception\n") - returned = pywikibot.input("question") + def test_exception_tb(self): + class TestException(Exception): - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual(newstderr.getvalue(), "question ") + """Test Exception.""" - self.assertIsInstance(returned, unicode) - self.assertEqual(returned, u"input to read") + try: + raise TestException("Testing Exception") + except TestException: + pywikibot.exception("exception", tb=True) + self.assertEqual(newstdout.getvalue(), "") + stderrlines = newstderr.getvalue().split("\n") + self.assertEqual(stderrlines[0], "ERROR: TestException: Testing Exception") + self.assertEqual(stderrlines[1], "Traceback (most recent call last):") + self.assertEqual(stderrlines[3], """ raise TestException("Testing Exception")""") + self.assertTrue(stderrlines[4].endswith(': Testing Exception')) - def _call_input_choice(self): - rv = pywikibot.input_choice( - "question", - (('answer 1', u'A'), - ('answer 2', u'N'), - ('answer 3', u'S')), - u'A', - automatic_quit=False) + self.assertNotEqual(stderrlines[-1], "\n") - self.assertEqual(newstdout.getvalue(), "") - self.assertIsInstance(rv, unicode) +class TestTerminalInput(UITestCase): - return rv + """Terminal input tests.""" - def testInputChoiceDefault(self): - newstdin.write("\n") - newstdin.seek(0) + input_choice_output = "question ([A]nswer 1, a[n]swer 2, an[s]wer 3) " - returned = self._call_input_choice() + def testInput(self): + newstdin.write("input to read\n") + newstdin.seek(0) - self.assertEqual(returned, "a") + returned = pywikibot.input("question") - def testInputChoiceCapital(self): - newstdin.write("N\n") - newstdin.seek(0) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual(newstderr.getvalue(), "question ") - returned = self._call_input_choice() + self.assertIsInstance(returned, unicode) + self.assertEqual(returned, u"input to read") - self.assertEqual(newstderr.getvalue(), self.input_choice_output) + def _call_input_choice(self): + rv = pywikibot.input_choice( + "question", + (('answer 1', u'A'), + ('answer 2', u'N'), + ('answer 3', u'S')), + u'A', + automatic_quit=False) - self.assertEqual(returned, "n") + self.assertEqual(newstdout.getvalue(), "") - def testInputChoiceNonCapital(self): - newstdin.write("n\n") - newstdin.seek(0) + self.assertIsInstance(rv, unicode) - returned = self._call_input_choice() + return rv - self.assertEqual(newstderr.getvalue(), self.input_choice_output) + def testInputChoiceDefault(self): + newstdin.write("\n") + newstdin.seek(0) - self.assertEqual(returned, "n") + returned = self._call_input_choice() - def testInputChoiceIncorrectAnswer(self): - newstdin.write("X\nN\n") - newstdin.seek(0) + self.assertEqual(returned, "a") - returned = self._call_input_choice() + def testInputChoiceCapital(self): + newstdin.write("N\n") + newstdin.seek(0) - self.assertEqual(newstderr.getvalue(), - self.input_choice_output * 2) + returned = self._call_input_choice() + + self.assertEqual(newstderr.getvalue(), self.input_choice_output) + + self.assertEqual(returned, "n") + + def testInputChoiceNonCapital(self): + newstdin.write("n\n") + newstdin.seek(0) + + returned = self._call_input_choice() + + self.assertEqual(newstderr.getvalue(), self.input_choice_output) + + self.assertEqual(returned, "n") + + def testInputChoiceIncorrectAnswer(self): + newstdin.write("X\nN\n") + newstdin.seek(0) + + returned = self._call_input_choice() + + self.assertEqual(newstderr.getvalue(), + self.input_choice_output * 2) + + self.assertEqual(returned, "n") + + +(a)unittest.skipUnless(os.name == "posix", "requires Unix console") +class TestTerminalOutputColorUnix(UITestCase): + + """Terminal output color tests.""" + + str1 = 'text \03{lightpurple}light purple text\03{default} text' + + def testOutputColorizedText(self): + pywikibot.output(self.str1) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual( + newstderr.getvalue(), + 'text \x1b[95mlight purple text\x1b[0m text\n\x1b[0m') - self.assertEqual(returned, "n") + def testOutputNoncolorizedText(self): + pywikibot.config.colorized_output = False + pywikibot.output(self.str1) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual( + newstderr.getvalue(), + 'text light purple text text ***\n') - @unittest.skipUnless(os.name == "posix", "requires Unix console") - class TestTerminalOutputColorUnix(UITestCase): + str2 = ('normal text \03{lightpurple} light purple ' + + '\03{lightblue} light blue \03{default} light purple ' + + '\03{default} normal text') - """Terminal output color tests.""" + @unittest.expectedFailure + def testOutputColorCascade(self): + pywikibot.output(self.str2) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual( + newstderr.getvalue(), + 'normal text \x1b[35;1m light purple ' + + '\x1b[94m light blue \x1b[35;1m light purple ' + + '\x1b[0m normal text\n\x1b[0m') - str1 = 'text \03{lightpurple}light purple text\03{default} text' + def testOutputColorCascade_incorrect(self): + """ Test incorrect behavior of testOutputColorCascade. """ + pywikibot.output(self.str2) + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual( + newstderr.getvalue(), + 'normal text \x1b[95m light purple ' + + '\x1b[94m light blue \x1b[0m light purple ' + + '\x1b[0m normal text\n\x1b[0m') - def testOutputColorizedText(self): - pywikibot.output(self.str1) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual( - newstderr.getvalue(), - 'text \x1b[95mlight purple text\x1b[0m text\n\x1b[0m') - def testOutputNoncolorizedText(self): - pywikibot.config.colorized_output = False - pywikibot.output(self.str1) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual( - newstderr.getvalue(), - 'text light purple text text ***\n') +(a)unittest.skipUnless(os.name == "posix", "requires Unix console") +class TestTerminalUnicodeUnix(UITestCase): - str2 = ('normal text \03{lightpurple} light purple ' + - '\03{lightblue} light blue \03{default} light purple ' + - '\03{default} normal text') + """Terminal output tests for unix.""" - @unittest.expectedFailure - def testOutputColorCascade(self): - pywikibot.output(self.str2) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual( - newstderr.getvalue(), - 'normal text \x1b[35;1m light purple ' + - '\x1b[94m light blue \x1b[35;1m light purple ' + - '\x1b[0m normal text\n\x1b[0m') + def testOutputUnicodeText(self): + pywikibot.output(u"Заглавная_страница") + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual( + newstderr.getvalue(), + self._encode(u'Заглавная_страница\n', 'utf-8')) - def testOutputColorCascade_incorrect(self): - """ Test incorrect behavior of testOutputColorCascade. """ - pywikibot.output(self.str2) - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual( - newstderr.getvalue(), - 'normal text \x1b[95m light purple ' + - '\x1b[94m light blue \x1b[0m light purple ' + - '\x1b[0m normal text\n\x1b[0m') + def testInputUnicodeText(self): + newstdin.write(self._encode(u'Заглавная_страница\n', 'utf-8')) + newstdin.seek(0) - @unittest.skipUnless(os.name == "posix", "requires Unix console") - class TestTerminalUnicodeUnix(UITestCase): + returned = pywikibot.input(u"Википедию? ") - """Terminal output tests for unix.""" + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual( + newstderr.getvalue(), + self._encode(u'Википедию? ', 'utf-8')) - def testOutputUnicodeText(self): - pywikibot.output(u"Заглавная_страница") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual( - newstderr.getvalue(), - self._encode(u'Заглавная_страница\n', 'utf-8')) + self.assertIsInstance(returned, unicode) + self.assertEqual(returned, u"Заглавная_страница") - def testInputUnicodeText(self): - newstdin.write(self._encode(u'Заглавная_страница\n', 'utf-8')) - newstdin.seek(0) - returned = pywikibot.input(u"Википедию? ") +(a)unittest.skipUnless(os.name == "posix", "requires Unix console") +class TestTransliterationUnix(UITestCase): - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual( - newstderr.getvalue(), - self._encode(u'Википедию? ', 'utf-8')) + """Terminal output transliteration tests.""" - self.assertIsInstance(returned, unicode) - self.assertEqual(returned, u"Заглавная_страница") + def testOutputTransliteratedUnicodeText(self): + pywikibot.ui.encoding = 'latin-1' + pywikibot.config.transliterate = True + pywikibot.output(u"abcd АБГД αβγδ あいうえお") + self.assertEqual(newstdout.getvalue(), "") + self.assertEqual( + newstderr.getvalue(), + 'abcd \x1b[93mA\x1b[0m\x1b[93mB\x1b[0m\x1b[93mG\x1b[0m' + '\x1b[93mD\x1b[0m \x1b[93ma\x1b[0m\x1b[93mb\x1b[0m\x1b[93mg' + '\x1b[0m\x1b[93md\x1b[0m \x1b[93ma\x1b[0m\x1b[93mi\x1b[0m' + '\x1b[93mu\x1b[0m\x1b[93me\x1b[0m\x1b[93mo\x1b[0m\n\x1b[0m') - @unittest.skipUnless(os.name == "posix", "requires Unix console") - class TestTransliterationUnix(UITestCase): - """Terminal output transliteration tests.""" +(a)unittest.skipUnless(os.name == "nt", "requires Windows console") +class WindowsTerminalTestCase(UITestCase): - def testOutputTransliteratedUnicodeText(self): - pywikibot.ui.encoding = 'latin-1' - pywikibot.config.transliterate = True - pywikibot.output(u"abcd АБГД αβγδ あいうえお") - self.assertEqual(newstdout.getvalue(), "") - self.assertEqual( - newstderr.getvalue(), - 'abcd \x1b[93mA\x1b[0m\x1b[93mB\x1b[0m\x1b[93mG\x1b[0m' - '\x1b[93mD\x1b[0m \x1b[93ma\x1b[0m\x1b[93mb\x1b[0m\x1b[93mg' - '\x1b[0m\x1b[93md\x1b[0m \x1b[93ma\x1b[0m\x1b[93mi\x1b[0m' - '\x1b[93mu\x1b[0m\x1b[93me\x1b[0m\x1b[93mo\x1b[0m\n\x1b[0m') + """MS Windows terminal tests.""" - @unittest.skipUnless(os.name == "nt", "requires Windows console") - class WindowsTerminalTestCase(UITestCase): + @classmethod + def setUpClass(cls): + if os.name != 'nt': + raise unittest.SkipTest('requires Windows console') + super(WindowsTerminalTestCase, cls).setUpClass() - """MS Windows terminal tests.""" + @classmethod + def setUpProcess(cls, command): + import pywinauto + import subprocess + si = subprocess.STARTUPINFO() + si.dwFlags = subprocess.STARTF_USESTDHANDLES + cls._process = subprocess.Popen(command, + creationflags=subprocess.CREATE_NEW_CONSOLE) - @classmethod - def setUpClass(cls): - if os.name != 'nt': - raise unittest.SkipTest('requires Windows console') - super(WindowsTerminalTestCase, cls).setUpClass() + cls._app = pywinauto.application.Application() + cls._app.connect_(process=cls._process.pid) - @classmethod - def setUpProcess(cls, command): - import pywinauto - import subprocess - si = subprocess.STARTUPINFO() - si.dwFlags = subprocess.STARTF_USESTDHANDLES - cls._process = subprocess.Popen(command, - creationflags=subprocess.CREATE_NEW_CONSOLE) + # set truetype font (Lucida Console, hopefully) + cls._app.window_().TypeKeys("% {UP}{ENTER}^L{HOME}L{ENTER}", with_spaces=True) - cls._app = pywinauto.application.Application() - cls._app.connect_(process=cls._process.pid) + @classmethod + def tearDownProcess(cls): + cls._process.kill() - # set truetype font (Lucida Console, hopefully) - cls._app.window_().TypeKeys("% {UP}{ENTER}^L{HOME}L{ENTER}", with_spaces=True) + def setUp(self): + super(WindowsTerminalTestCase, self).setUp() + self.setclip(u'') - @classmethod - def tearDownProcess(cls): - cls._process.kill() + def waitForWindow(self): + while not self._app.window_().IsEnabled(): + time.sleep(0.01) - def setUp(self): - super(WindowsTerminalTestCase, self).setUp() - self.setclip(u'') + def getstdouterr(self): + sentinel = u'~~~~SENTINEL~~~~cedcfc9f-7eed-44e2-a176-d8c73136c185' + # select all and copy to clipboard + self._app.window_().SetFocus() + self.waitForWindow() + self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{DOWN}{ENTER}{ENTER}', with_spaces=True) - def waitForWindow(self): - while not self._app.window_().IsEnabled(): - time.sleep(0.01) + while True: + data = self.getclip() + if data != sentinel: + return data + time.sleep(0.01) - def getstdouterr(self): - sentinel = u'~~~~SENTINEL~~~~cedcfc9f-7eed-44e2-a176-d8c73136c185' - # select all and copy to clipboard - self._app.window_().SetFocus() - self.waitForWindow() - self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{DOWN}{ENTER}{ENTER}', with_spaces=True) + def setclip(self, text): + import win32clipboard - while True: - data = self.getclip() - if data != sentinel: - return data - time.sleep(0.01) + win32clipboard.OpenClipboard() + win32clipboard.SetClipboardData(win32clipboard.CF_UNICODETEXT, unicode(text)) + win32clipboard.CloseClipboard() - def setclip(self, text): - import win32clipboard + def getclip(self): + import win32clipboard - win32clipboard.OpenClipboard() - win32clipboard.SetClipboardData(win32clipboard.CF_UNICODETEXT, unicode(text)) - win32clipboard.CloseClipboard() + win32clipboard.OpenClipboard() + data = win32clipboard.GetClipboardData(win32clipboard.CF_UNICODETEXT) + win32clipboard.CloseClipboard() + data = data.split(u"\x00")[0] + data = data.replace(u"\r\n", u"\n") + return data - def getclip(self): - import win32clipboard + def sendstdin(self, text): + self.setclip(text.replace(u"\n", u"\r\n")) + self._app.window_().SetFocus() + self.waitForWindow() + self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{ENTER}', with_spaces=True) - win32clipboard.OpenClipboard() - data = win32clipboard.GetClipboardData(win32clipboard.CF_UNICODETEXT) - win32clipboard.CloseClipboard() - data = data.split(u"\x00")[0] - data = data.replace(u"\r\n", u"\n") - return data - def sendstdin(self, text): - self.setclip(text.replace(u"\n", u"\r\n")) - self._app.window_().SetFocus() - self.waitForWindow() - self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{ENTER}', with_spaces=True) +class TestWindowsTerminalUnicode(WindowsTerminalTestCase): - class TestWindowsTerminalUnicode(WindowsTerminalTestCase): + """MS Windows terminal unicode tests.""" - """MS Windows terminal unicode tests.""" + @classmethod + def setUpClass(cls): + super(TestWindowsTerminalUnicode, cls).setUpClass() + import inspect + fn = inspect.getfile(inspect.currentframe()) + cls.setUpProcess(["python", "pwb.py", fn, "--run-as-slave-interpreter"]) - @classmethod - def setUpClass(cls): - super(TestWindowsTerminalUnicode, cls).setUpClass() - import inspect - fn = inspect.getfile(inspect.currentframe()) - cls.setUpProcess(["python", "pwb.py", fn, "--run-as-slave-interpreter"]) + _manager.connect() + cls.pywikibot = _manager.pywikibot() - _manager.connect() - cls.pywikibot = _manager.pywikibot() + @classmethod + def tearDownClass(cls): + del cls.pywikibot + cls.tearDownProcess() - @classmethod - def tearDownClass(cls): - del cls.pywikibot - cls.tearDownProcess() + def setUp(self): + super(TestWindowsTerminalUnicode, self).setUp() - def setUp(self): - super(TestWindowsTerminalUnicode, self).setUp() + self.pywikibot.set_config('colorized_output', True) + self.pywikibot.set_config('transliterate', False) + self.pywikibot.set_config('console_encoding', 'utf-8') + self.pywikibot.set_ui('transliteration_target', None) + self.pywikibot.set_ui('encoding', 'utf-8') - self.pywikibot.set_config('colorized_output', True) - self.pywikibot.set_config('transliterate', False) - self.pywikibot.set_config('console_encoding', 'utf-8') - self.pywikibot.set_ui('transliteration_target', None) - self.pywikibot.set_ui('encoding', 'utf-8') + self.pywikibot.cls() - self.pywikibot.cls() + def testOutputUnicodeText_no_transliterate(self): + self.pywikibot.output(u"Заглавная_страница") + self.assertEqual(self.getstdouterr(), u"Заглавная_страница\n") - def testOutputUnicodeText_no_transliterate(self): - self.pywikibot.output(u"Заглавная_страница") - self.assertEqual(self.getstdouterr(), u"Заглавная_страница\n") + def testOutputUnicodeText_transliterate(self): + self.pywikibot.set_config('transliterate', True) + self.pywikibot.set_ui('transliteration_target', 'latin-1') + self.pywikibot.output(u"Заглавная_страница") + self.assertEqual(self.getstdouterr(), "Zaglavnaya_stranica\n") - def testOutputUnicodeText_transliterate(self): - self.pywikibot.set_config('transliterate', True) - self.pywikibot.set_ui('transliteration_target', 'latin-1') - self.pywikibot.output(u"Заглавная_страница") - self.assertEqual(self.getstdouterr(), "Zaglavnaya_stranica\n") + def testInputUnicodeText(self): + self.pywikibot.set_config('transliterate', True) - def testInputUnicodeText(self): - self.pywikibot.set_config('transliterate', True) + self.pywikibot.request_input(u"Википедию? ") + self.assertEqual(self.getstdouterr(), u"Википедию?") + self.sendstdin(u"Заглавная_страница\n") + returned = self.pywikibot.get_input() - self.pywikibot.request_input(u"Википедию? ") - self.assertEqual(self.getstdouterr(), u"Википедию?") - self.sendstdin(u"Заглавная_страница\n") - returned = self.pywikibot.get_input() + self.assertEqual(returned, u"Заглавная_страница") - self.assertEqual(returned, u"Заглавная_страница") - class TestWindowsTerminalUnicodeArguments(WindowsTerminalTestCase): +class TestWindowsTerminalUnicodeArguments(WindowsTerminalTestCase): - """MS Windows terminal unicode argument tests.""" + """MS Windows terminal unicode argument tests.""" - @classmethod - def setUpClass(cls): - super(TestWindowsTerminalUnicodeArguments, cls).setUpClass() - cls.setUpProcess(["cmd", "/k", "echo off"]) + @classmethod + def setUpClass(cls): + super(TestWindowsTerminalUnicodeArguments, cls).setUpClass() + cls.setUpProcess(["cmd", "/k", "echo off"]) - @classmethod - def tearDownClass(cls): - cls.tearDownProcess() - pass + @classmethod + def tearDownClass(cls): + cls.tearDownProcess() + pass - def testOutputUnicodeText_no_transliterate(self): - self.sendstdin(u"""python -c "import os, pywikibot; os.system('cls'); pywikibot.output(u'\\n'.join(pywikibot.handleArgs()))" Alpha Bετα Гамма دلتا\n""") - while(True): - lines = self.getstdouterr().split("\n") - if len(lines) >= 4 and lines[0] == "Alpha": - break - time.sleep(1) + def testOutputUnicodeText_no_transliterate(self): + self.sendstdin(u"""python -c "import os, pywikibot; os.system('cls'); pywikibot.output(u'\\n'.join(pywikibot.handleArgs()))" Alpha Bετα Гамма دلتا\n""") + while(True): + lines = self.getstdouterr().split("\n") + if len(lines) >= 4 and lines[0] == "Alpha": + break + time.sleep(1) - # empty line is the new command line - self.assertEqual(lines, [u"Alpha", u"Bετα", u"Гамма", u"دلتا", u""]) + # empty line is the new command line + self.assertEqual(lines, [u"Alpha", u"Bετα", u"Гамма", u"دلتا", u""]) if __name__ == "__main__": -- To view, visit https://gerrit.wikimedia.org/r/186646 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ab67f422a1d9df1da1ae0523f3f163577c416c1 Gerrit-PatchSet: 10 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [FIX] ui tests: Monkey patch pwb's UI class - change (pywikibot/core)
by jenkins-bot (Code Review) 26 Jan '15

26 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] ui tests: Monkey patch pwb's UI class ...................................................................... [FIX] ui tests: Monkey patch pwb's UI class This monkey patches the ui class used in pywikibot.bot. It is necessary as on loading the pywikibot package it is creating a logger and handlers which use the current std* streams (which are at that moment sys.std*) as the target streams. This is intercepting a print to the console and changing the targetStream (which was defined on creation of the handler) to a internal buffer stream. Also reading from the console is intercepted and redirected to returning the value of the internal stream. This is only patching stderr and stdout so if any other targetStream is used it'll crash (intentionally so we can determine what is happening there). The ui_tests are now also activated so they are run by Travis. Change-Id: I388f6253a401ef3be49f00b945e5414e47638109 --- M tests/__init__.py M tests/ui_tests.py 2 files changed, 59 insertions(+), 39 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index edea8ba..3cf20fd 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -59,6 +59,7 @@ library_test_modules = [ 'deprecation', + 'ui', 'tests', 'date', 'mediawikiversion', @@ -100,7 +101,6 @@ disabled_test_modules = [ 'tests', # tests of the tests package - 'ui', # these tests havent been designed to be run in the test runner. ] disabled_tests = { diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 7045a40..365b329 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -33,26 +33,40 @@ import time import io +import pywikibot +from pywikibot.bot import ( + ui, DEBUG, VERBOSE, INFO, STDOUT, INPUT, WARNING, ERROR, CRITICAL +) +from tests.utils import unittest + if sys.version_info[0] > 2: unicode = str class Stream(object): - """Handler for a StrigIO or BytesIO instance able to patch itself.""" + """Handler for a StringIO or BytesIO instance able to patch itself.""" - def __init__(self, name): + def __init__(self, name, patched_streams): + """ + Create a new stream with a StringIO or BytesIO instance. + + @param name: The part after 'std' (e.g. 'err'). + @type name: str + @param patched_streams: A mapping which maps the original stream to + the patched stream. + @type patched_streams: dict + """ self._stream = io.StringIO() if sys.version_info[0] > 2 else io.BytesIO() self._name = 'std{0}'.format(name) self._original = getattr(sys, self._name) + patched_streams[self._original] = self._stream - def patch(self): - setattr(sys, self._name, self._stream) + def reset(self): + """Reset own stream.""" self._stream.truncate(0) self._stream.seek(0) - def unpatch(self): - setattr(sys, self._name, self._original) if os.name == "nt": from multiprocessing.managers import BaseManager @@ -106,36 +120,41 @@ s = _manager.get_server() s.serve_forever() -if __name__ == "__main__": - strout = Stream('out') - strerr = Stream('err') - strin = Stream('in') + +def patched_print(text, targetStream): + org_print(text, patched_streams[targetStream]) + + +def patched_input(): + return strin._stream.readline().strip() + + +# TODO: This complete section doesn't depend on __name__ == '__main__' anymore +if True: + patched_streams = {} + strout = Stream('out', patched_streams) + strerr = Stream('err', patched_streams) + strin = Stream('in', {}) newstdout = strout._stream newstderr = strerr._stream newstdin = strin._stream + org_print = ui._print + org_input = ui._raw_input + def patch(): """Patch standard terminal files.""" - strout.patch() - strerr.patch() - strin.patch() + strout.reset() + strerr.reset() + strin.reset() + ui._print = patched_print + ui._raw_input = patched_input def unpatch(): """un-patch standard terminal files.""" - strout.unpatch() - strerr.unpatch() - strin.unpatch() - - try: - patch() - import pywikibot - finally: - unpatch() - - from tests.utils import unittest - - from pywikibot.bot import DEBUG, VERBOSE, INFO, STDOUT, INPUT, WARNING, ERROR, CRITICAL + ui._print = org_print + ui._raw_input = org_input logger = logging.getLogger('pywiki') loggingcontext = {'caller_name': "ui_tests", @@ -146,6 +165,8 @@ class UITestCase(unittest.TestCase): """UI tests.""" + + net = False def setUp(self): patch() @@ -265,7 +286,7 @@ self.assertEqual(stderrlines[0], "ERROR: TestException: Testing Exception") self.assertEqual(stderrlines[1], "Traceback (most recent call last):") self.assertEqual(stderrlines[3], """ raise TestException("Testing Exception")""") - self.assertEqual(stderrlines[4], "TestException: Testing Exception") + self.assertTrue(stderrlines[4].endswith(': Testing Exception')) self.assertNotEqual(stderrlines[-1], "\n") @@ -436,6 +457,12 @@ """MS Windows terminal tests.""" @classmethod + def setUpClass(cls): + if os.name != 'nt': + raise unittest.SkipTest('requires Windows console') + super(WindowsTerminalTestCase, cls).setUpClass() + + @classmethod def setUpProcess(cls, command): import pywinauto import subprocess @@ -504,6 +531,7 @@ @classmethod def setUpClass(cls): + super(TestWindowsTerminalUnicode, cls).setUpClass() import inspect fn = inspect.getfile(inspect.currentframe()) cls.setUpProcess(["python", "pwb.py", fn, "--run-as-slave-interpreter"]) @@ -553,6 +581,7 @@ @classmethod def setUpClass(cls): + super(TestWindowsTerminalUnicodeArguments, cls).setUpClass() cls.setUpProcess(["cmd", "/k", "echo off"]) @classmethod @@ -571,6 +600,8 @@ # empty line is the new command line self.assertEqual(lines, [u"Alpha", u"Bετα", u"Гамма", u"دلتا", u""]) + +if __name__ == "__main__": try: try: unittest.main() @@ -578,14 +609,3 @@ pass finally: unpatch() - -else: - from tests.utils import unittest - - class TestTerminalUI(unittest.TestCase): - - """Class to show all tests skipped under unittest.""" - - @unittest.skip("Terminal UI tests can only be run by directly running tests/ui_tests.py") - def testCannotBeRun(self): - pass -- To view, visit https://gerrit.wikimedia.org/r/186556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I388f6253a401ef3be49f00b945e5414e47638109 Gerrit-PatchSet: 8 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Fix NoPage exception in unusedfiles.py - change (pywikibot/core)
by jenkins-bot (Code Review) 26 Jan '15

26 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Fix NoPage exception in unusedfiles.py ...................................................................... Fix NoPage exception in unusedfiles.py The page and not the title shall be passed to the exception. Added also missing docstrings. Updated tox.ini [flake8-docstrings-mandatory] with: - unusedfiles.py - category.py Change-Id: I1e2f65dac9ca734ed8e749a11cc063389170a11d --- M scripts/unusedfiles.py M tox.ini 2 files changed, 7 insertions(+), 2 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py index 611bd90..a4c7fd9 100644 --- a/scripts/unusedfiles.py +++ b/scripts/unusedfiles.py @@ -13,7 +13,7 @@ # (C) Leonardo Gregianin, 2007 # (C) Filnik, 2008 # (c) xqt, 2011-2014 -# (C) Pywikibot team, 2014 +# (C) Pywikibot team, 2015 # # Distributed under the terms of the MIT license. # @@ -53,10 +53,12 @@ """Unused files bot.""" def __init__(self, site, **kwargs): + """Constructor.""" super(UnusedFilesBot, self).__init__(**kwargs) self.site = site def run(self): + """Start the bot.""" template_image = i18n.translate(self.site, template_to_the_image) template_user = i18n.translate(self.site, @@ -89,6 +91,7 @@ self.append_text(usertalkpage, msg2uploader) def append_text(self, page, apptext): + """Append apptext to the page.""" if page.isRedirectPage(): page = page.getRedirectTarget() if page.exists(): @@ -97,7 +100,7 @@ if page.isTalkPage(): text = u'' else: - raise pywikibot.NoPage(u"Page '%s' does not exist" % page.title()) + raise pywikibot.NoPage(page) oldtext = text text += apptext diff --git a/tox.ini b/tox.ini index 5614737..050b795 100644 --- a/tox.ini +++ b/tox.ini @@ -62,6 +62,7 @@ scripts/basic.py \ scripts/blockpageschecker.py \ scripts/capitalize_redirects.py \ + scripts/category.py \ scripts/category_redirect.py \ scripts/claimit.py \ scripts/clean_sandbox.py \ @@ -86,6 +87,7 @@ scripts/states_redirect.py \ scripts/template.py \ scripts/transferbot.py \ + scripts/unusedfiles.py \ scripts/upload.py \ scripts/watchlist.py \ setup.py \ -- To view, visit https://gerrit.wikimedia.org/r/186642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e2f65dac9ca734ed8e749a11cc063389170a11d Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [i18n] Don't check whether a summary message exists - change (pywikibot/core)
by jenkins-bot (Code Review) 25 Jan '15

25 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [i18n] Don't check whether a summary message exists ...................................................................... [i18n] Don't check whether a summary message exists The edit summary is i18n and not a L10N. There is no reason to check whether a message exists for a given language code because the there is a fallback to at least en language. Change-Id: I00901866a3da5b1132e13f1e050a1175eb56e3aa --- M scripts/redirect.py 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index 2fa2c83..b800647 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -489,10 +489,8 @@ assert targetPage.site == self.site, ( u'target page is on different site %s' % targetPage.site) - if (self.has_valid_template( - 'redirect-broken-redirect-template') and - i18n.twhas_key(targetPage.site, - 'redirect-remove-broken')): + if self.has_valid_template( + 'redirect-broken-redirect-template'): pywikibot.output(u"No sysop in user-config.py, " u"put page to speedy deletion.") content = redir_page.get(get_redirect=True) -- To view, visit https://gerrit.wikimedia.org/r/186636 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00901866a3da5b1132e13f1e050a1175eb56e3aa Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ricordisamoa <ricordisamoa(a)openmailbox.org> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Bot: Count pages processed and modified - change (pywikibot/core)
by jenkins-bot (Code Review) 25 Jan '15

25 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Bot: Count pages processed and modified ...................................................................... Bot: Count pages processed and modified Fixed output in `featured` script. Used in `category` script to output that no pages were processed. Change-Id: I68a8ff191d93035be3a4a54f4717e62a8eb6c399 --- M pywikibot/bot.py M scripts/category.py M scripts/featured.py 3 files changed, 36 insertions(+), 18 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 1b4bb34..e814aef 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -899,6 +899,8 @@ self.setOptions(**kwargs) self._site = None self._sites = set() + self._treat_counter = 0 + self._save_counter = 0 def setOptions(self, **kwargs): """ @@ -1044,6 +1046,7 @@ try: func(*args, **kwargs) + self._save_counter += 1 except pywikibot.PageSaveRelatedError as e: if not ignore_save_related_errors: raise @@ -1130,6 +1133,10 @@ log('Bot is managing the %s.site property in run()' % self.__class__.__name__) + maxint = 0 + if sys.version_info[0] == 2: + maxint = sys.maxint + try: for page in self.generator: # When in auto update mode, set the site when it changes, @@ -1137,7 +1144,17 @@ if (auto_update_site and (not self._site or page.site != self.site)): self.site = page.site + + # Process the page self.treat(page) + + self._treat_counter += 1 + if maxint and self._treat_counter == maxint: + # Warn the user that the bot may not function correctly + pywikibot.error( + '\n%s: page count reached Python 2 sys.maxint (%d).\n' + 'Python 3 should be used to process very large batches' + % (self.__class__.__name__, sys.maxint)) except QuitKeyboardInterrupt: pywikibot.output('\nUser quit %s bot run...' % self.__class__.__name__) diff --git a/scripts/category.py b/scripts/category.py index 610059d..bec702b 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -785,7 +785,7 @@ self.list.put(listString, comment=self.editSummary) -class CategoryTidyRobot: +class CategoryTidyRobot(pywikibot.Bot): """Script to help by moving articles of the category into subcategories. @@ -814,10 +814,14 @@ """Constructor.""" self.catTitle = catTitle self.catDB = catDB - self.site = pywikibot.Site() - self.editSummary = i18n.twtranslate(self.site, 'category-changing', - {'oldcat': self.catTitle, + site = pywikibot.Site() + self.editSummary = i18n.twtranslate(site, 'category-changing', + {'oldcat': catTitle, 'newcat': u''}) + self.cat = pywikibot.Category(site, catTitle) + super(CategoryTidyRobot, self).__init__( + generator=pagegenerators.PreloadingGenerator( + self.cat.articles())) def move_to_category(self, article, original_cat, current_cat): """ @@ -935,20 +939,17 @@ def run(self): """Start bot.""" - cat = pywikibot.Category(self.site, self.catTitle) - - empty = True - preloadingGen = pagegenerators.PreloadingGenerator(cat.articles()) - for article in preloadingGen: - empty = False - pywikibot.output('') - pywikibot.output(u'=' * 67) - self.move_to_category(article, cat, cat) - - if empty: + super(CategoryTidyRobot, self).run() + if not self._treat_counter: pywikibot.output(u'There are no articles or files in category %s' % self.catTitle) + def treat(self, page): + """Process page.""" + pywikibot.output('') + pywikibot.output(u'=' * 67) + self.move_to_category(page, self.cat, self.cat) + class CategoryTreeRobot: diff --git a/scripts/featured.py b/scripts/featured.py index 7f9f8bd..184612f 100644 --- a/scripts/featured.py +++ b/scripts/featured.py @@ -233,7 +233,6 @@ }) super(FeaturedBot, self).__init__(**kwargs) - self.editcounter = 0 self.cache = dict() self.filename = None self.site = pywikibot.Site() @@ -332,11 +331,11 @@ def run(self): for task in self.tasks: self.run_task(task) - pywikibot.output(u'%d pages written.' % self.editcounter) + pywikibot.output(u'%d pages written.' % self._save_counter) def run_task(self, task): if not self.hastemplate(task): - pywikibot.output(u'\nNOTE: %s arcticles are not implemented at %s.' + pywikibot.output(u'\nNOTE: %s articles are not implemented at %s.' % (task, self.site)) return @@ -595,6 +594,7 @@ {'page': source}) try: dest.put(text, comment) + self._save_counter += 1 except pywikibot.LockedPage: pywikibot.output(u'Page %s is locked!' % dest.title()) -- To view, visit https://gerrit.wikimedia.org/r/186615 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68a8ff191d93035be3a4a54f4717e62a8eb6c399 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Add tests for Category redirects - change (pywikibot/core)
by jenkins-bot (Code Review) 25 Jan '15

25 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Add tests for Category redirects ...................................................................... Add tests for Category redirects Change-Id: I3e7ed4f8ece80f81d533982983da46d175e5d2f1 --- M tests/category_tests.py 1 file changed, 17 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/category_tests.py b/tests/category_tests.py index 9e57069..8923884 100644 --- a/tests/category_tests.py +++ b/tests/category_tests.py @@ -132,6 +132,23 @@ articles_total = list(cat.articles(total=2)) self.assertEqual(len(articles_total), 2) + def test_redirects(self): + """Test the redirects method.""" + site = self.get_site() + cat1 = pywikibot.Category(site, 'Category:Fonts') + cat2 = pywikibot.Category(site, 'Category:Typefaces') + + self.assertTrue(cat1.isCategoryRedirect()) + self.assertFalse(cat2.isCategoryRedirect()) + + # The correct target category if fetched. + tgt = cat1.getCategoryRedirectTarget() + self.assertEqual(tgt, cat2) + + # Raise exception if target is fetched for non Category redirects. + self.assertRaises(pywikibot.IsNotRedirectPage, + cat2.getCategoryRedirectTarget) + class TestCategoryDryObject(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/186628 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3e7ed4f8ece80f81d533982983da46d175e5d2f1 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [L10N] backport default settings from core to compat - change (pywikibot/compat)
by jenkins-bot (Code Review) 25 Jan '15

25 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [L10N] backport default settings from core to compat ...................................................................... [L10N] backport default settings from core to compat Change-Id: If04ae8b09fa061ae6d4fbe5def240b99ff633205 --- M commonscat.py 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/commonscat.py b/commonscat.py index 97b5379..19ae476 100644 --- a/commonscat.py +++ b/commonscat.py @@ -25,7 +25,6 @@ For example to go through all categories: commonscat.py -start:Category:! """ -# TODO: """ Commonscat bot: @@ -47,7 +46,7 @@ # # (C) Multichill, 2008-2009 # (C) Xqt, 2009-2015 -# (C) Pywikipedia bot team, 2008-2015 +# (C) Pywikibot team, 2008-2015 # # Distributed under the terms of the MIT license. # @@ -82,7 +81,6 @@ 'da': (u'Commonscat', [u'Commons cat', u'Commons category', u'Commonscat left', u'Commonscat2']), - 'de': (u'Commonscat', [u'Commons cat']), 'en': (u'Commons category', [u'Commoncat', u'Commonscat', u'Commons cat', u'Commons+cat', u'Commonscategory', u'Commons and category', u'Commonscat-inline', -- To view, visit https://gerrit.wikimedia.org/r/186625 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If04ae8b09fa061ae6d4fbe5def240b99ff633205 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] [L10N] Commonscat is the only valid template in de-wiki - change (pywikibot/core)
by jenkins-bot (Code Review) 25 Jan '15

25 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: [L10N] Commonscat is the only valid template in de-wiki ...................................................................... [L10N] Commonscat is the only valid template in de-wiki Change-Id: I1e6c6b10f0dc956bba238ea1f7c1dd9757603545 --- M scripts/commonscat.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/commonscat.py b/scripts/commonscat.py index 4d41b15..cc9fb19 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -91,7 +91,6 @@ 'da': (u'Commonscat', [u'Commons cat', u'Commons category', u'Commonscat left', u'Commonscat2']), - 'de': (u'Commonscat', [u'Commons cat']), 'en': (u'Commons category', [u'Commoncat', u'Commonscat', u'Commons cat', u'Commons+cat', u'Commonscategory', u'Commons and category', u'Commonscat-inline', -- To view, visit https://gerrit.wikimedia.org/r/186623 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e6c6b10f0dc956bba238ea1f7c1dd9757603545 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Fix IsNotRedirectPage exception in Page.getCategoryRedirectT... - change (pywikibot/core)
by jenkins-bot (Code Review) 25 Jan '15

25 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Fix IsNotRedirectPage exception in Page.getCategoryRedirectTarget() ...................................................................... Fix IsNotRedirectPage exception in Page.getCategoryRedirectTarget() The page and not the title shall be passed to the exception. Bug: T87505 Change-Id: If25e3ab177a2aa892410412c15e6963f5999b414 --- M pywikibot/page.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Russell Blau: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index a10291f..e311e56 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -676,7 +676,7 @@ """ if self.isCategoryRedirect(): return Category(Link(self._catredirect, self.site)) - raise pywikibot.IsNotRedirectPage(self.title()) + raise pywikibot.IsNotRedirectPage(self) def isEmpty(self): """Return True if the page text has less than 4 characters. -- To view, visit https://gerrit.wikimedia.org/r/186612 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If25e3ab177a2aa892410412c15e6963f5999b414 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: jenkins-bot <>

1 0

[Gerrit] Obsolete and single code site tests - change (pywikibot/core)
by jenkins-bot (Code Review) 25 Jan '15

25 Jan '15

jenkins-bot has submitted this change and it was merged. Change subject: Obsolete and single code site tests ...................................................................... Obsolete and single code site tests Add tests to capture the current behaviour of obsolete sites and sites with only one code. Moved a family related assert from site_tests into family_tests. Change-Id: I3d1bcf23134a0543ababc8f14ffa4ecc284535fd --- M tests/aspects.py M tests/family_tests.py M tests/http_tests.py M tests/site_tests.py 4 files changed, 250 insertions(+), 5 deletions(-) Approvals: XZise: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/aspects.py b/tests/aspects.py index b6b0956..41f5071 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -815,7 +815,12 @@ data['site'] = Site(data['code'], data['family'], interface=interface) if 'hostname' not in data and 'site' in data: - data['hostname'] = data['site'].hostname() + try: + data['hostname'] = data['site'].hostname() + except KeyError: + # The family has defined this as obsolete + # without a mapping to a hostname. + pass if not hasattr(cls, 'cached') or not cls.cached: pywikibot._sites = orig_sites diff --git a/tests/family_tests.py b/tests/family_tests.py index 3cbadea..7258cc8 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -77,6 +77,17 @@ other = 'unknown' self.assertRaises(UnknownFamily, family.__eq__, other) + def test_obsolete(self): + """Test three types of obsolete codes.""" + family = Family.load('wikipedia') + self.assertIsInstance(family.obsolete, dict) + # redirected code (see site tests test_alias_code_site) + self.assertEqual(family.obsolete['dk'], 'da') + # closed/locked site (see site tests test_locked_site) + self.assertEqual(family.obsolete['mh'], None) + # offline site (see site tests test_removed_site) + self.assertEqual(family.obsolete['ru-sib'], None) + class TestOldFamilyMethod(DeprecationTestCase): diff --git a/tests/http_tests.py b/tests/http_tests.py index 4b1a885..846069f 100644 --- a/tests/http_tests.py +++ b/tests/http_tests.py @@ -9,9 +9,13 @@ import sys +import httplib2 + import pywikibot -from pywikibot.comms import http, threadedhttp + from pywikibot import config2 as config +from pywikibot.comms import http, threadedhttp + from tests.aspects import unittest, TestCase from tests.utils import expected_failure_if @@ -129,16 +133,48 @@ self.assertEqual(organisation, 'TuxFamily.org non-profit organization') + +class TestHttpStatus(TestCase): + + """Test HTTP status code handling and errors.""" + + sites = { + 'getstatuscode': { + 'hostname': 'getstatuscode.com', + }, + 'enwp': { + 'hostname': 'en.wikipedia.org', + }, + 'gandi': { + 'hostname': 'www.gandi.eu', + }, + } + def test_http_504(self): """Test that a HTTP 504 raises the correct exception.""" self.assertRaises(pywikibot.Server504Error, http.fetch, uri='http://getstatuscode.com/504') + def test_server_not_found(self): + """Test server not found exception.""" + self.assertRaises(httplib2.ServerNotFoundError, + http.fetch, + uri='http://ru-sib.wikipedia.org/w/api.php', + default_error_handling=True) + + def test_invalid_scheme(self): + """Test invalid scheme.""" + # A KeyError is raised within httplib2, in a different thread + self.assertRaises(KeyError, + http.fetch, + uri='invalid://url') + def test_follow_redirects(self): """Test follow 301 redirects after an exception works correctly.""" - # to be effective, this exception should be raised in httplib2 - self.assertRaises(Exception, + # It doesnt matter what exception is raised here, provided it + # occurs within the httplib2 request method. + self.assertRaises(KeyError, http.fetch, uri='invalid://url') diff --git a/tests/site_tests.py b/tests/site_tests.py index 55e3d3f..c3e91c5 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -16,6 +16,7 @@ import pywikibot from pywikibot import config +from pywikibot.comms import http from pywikibot.tools import MediaWikiVersion from pywikibot.data import api @@ -25,6 +26,7 @@ WikimediaDefaultSiteTestCase, WikidataTestCase, DefaultWikidataClientTestCase, + AlteredDefaultSiteTestCase, ) from tests.utils import allowed_failure, allowed_failure_if @@ -173,10 +175,12 @@ langs = mysite.languages() self.assertIsInstance(langs, list) self.assertIn(mysite.code, langs) - mysite.family.obsolete + self.assertIsInstance(mysite.obsolete, bool) ipf = mysite.interwiki_putfirst() if ipf: # Not all languages use this self.assertIsInstance(ipf, list) + else: + self.assertIsNone(ipf) for item in mysite.validLanguageLinks(): self.assertIn(item, langs) @@ -2151,6 +2155,195 @@ self.assertFalse(site.sametitle('Invalid:Foo', ':Foo')) self.assertFalse(site.sametitle('Invalid:Foo', 'Invalid:foo')) + +class TestObsoleteSite(TestCase): + + """Test 'closed' and obsolete code sites.""" + + # hostname() fails, so it is provided here otherwise the + # test class fails with hostname not defined for mh.wikipedia.org + sites = { + 'mhwp': { + 'family': 'wikipedia', + 'code': 'mh', + 'hostname': 'mh.wikipedia.org', + }, + # pywikibot should never attempt to access jp.wikipedia.org, + # however this entry ensures that there is a change in the builds + # if jp.wikipedia.org goes offline. + 'jpwp': { + 'family': 'wikipedia', + 'code': 'jp', + 'hostname': 'jp.wikipedia.org', + }, + 'jawp': { + 'family': 'wikipedia', + 'code': 'ja', + }, + } + + def test_locked_site(self): + """Test Wikimedia closed/locked site.""" + site = self.get_site('mhwp') + self.assertEqual(site.code, 'mh') + self.assertIsInstance(site.obsolete, bool) + self.assertTrue(site.obsolete) + self.assertRaises(KeyError, site.hostname) + r = http.fetch(uri='http://mh.wikipedia.org/w/api.php', + default_error_handling=False) + self.assertEqual(r.status, 200) + + def test_removed_site(self): + """Test Wikimedia offline site.""" + site = pywikibot.Site('ru-sib', 'wikipedia') + self.assertEqual(site.code, 'ru-sib') + self.assertIsInstance(site.obsolete, bool) + self.assertTrue(site.obsolete) + self.assertRaises(KeyError, site.hostname) + # See also http_tests, which tests that ru-sib.wikipedia.org is offline + + def test_alias_code_site(self): + """Test Wikimedia site with an alias code.""" + site = self.get_site('jpwp') + self.assertIsInstance(site.obsolete, bool) + self.assertEqual(site.code, 'ja') + self.assertFalse(site.obsolete) + self.assertEqual(site.hostname(), 'ja.wikipedia.org') + self.assertEqual(site.ssl_hostname(), 'ja.wikipedia.org') + + +class TestSingleCodeFamilySite(AlteredDefaultSiteTestCase): + + """Test site without other production sites in its family.""" + + sites = { + 'wikia': { + 'family': 'wikia', + 'code': 'wikia', + }, + 'lyricwiki': { + 'family': 'lyricwiki', + 'code': 'en', + }, + 'commons': { + 'family': 'commons', + 'code': 'commons', + }, + 'wikidata': { + 'family': 'wikidata', + 'code': 'wikidata', + }, + 'wikidatatest': { + 'family': 'wikidata', + 'code': 'test', + }, + } + + def test_wikia(self): + """Test www.wikia.com.""" + site = self.get_site('wikia') + self.assertEqual(site.hostname(), 'www.wikia.com') + self.assertEqual(site.code, 'wikia') + self.assertIsInstance(site.namespaces, dict) + self.assertFalse(site.obsolete) + self.assertEqual(site.family.hostname('en'), 'www.wikia.com') + self.assertEqual(site.family.hostname('wikia'), 'www.wikia.com') + self.assertEqual(site.family.hostname('www'), 'www.wikia.com') + + pywikibot.config.family = 'wikia' + pywikibot.config.mylang = 'de' + + site2 = pywikibot.Site('www', 'wikia') + self.assertEqual(site2.code, 'wikia') + self.assertFalse(site2.obsolete) + self.assertEqual(site, site2) + self.assertEqual(pywikibot.config.mylang, 'de') + + site2 = pywikibot.Site('really_invalid', 'wikia') + self.assertEqual(site2.code, 'wikia') + self.assertFalse(site2.obsolete) + self.assertEqual(site, site2) + self.assertEqual(pywikibot.config.mylang, 'de') + + site2 = pywikibot.Site('de', 'wikia') + self.assertEqual(site2.code, 'wikia') + self.assertFalse(site2.obsolete) + self.assertEqual(site, site2) + # When the code is the same as config.mylang, Site() changes mylang + self.assertEqual(pywikibot.config.mylang, 'wikia') + + def test_lyrics(self): + """Test lyrics.wikia.com.""" + site = self.get_site('lyricwiki') + self.assertEqual(site.hostname(), 'lyrics.wikia.com') + self.assertEqual(site.code, 'en') + self.assertIsInstance(site.namespaces, dict) + self.assertFalse(site.obsolete) + self.assertEqual(site.family.hostname('en'), 'lyrics.wikia.com') + + self.assertRaises(KeyError, site.family.hostname, 'lyrics') + self.assertRaises(KeyError, site.family.hostname, 'lyricwiki') + + self.assertRaises(pywikibot.UnknownSite, pywikibot.Site, + 'lyricwiki', 'lyricwiki') + + self.assertRaises(pywikibot.UnknownSite, pywikibot.Site, + 'de', 'lyricwiki') + + def test_commons(self): + """Test Wikimedia Commons.""" + site = self.get_site('commons') + self.assertEqual(site.hostname(), 'commons.wikimedia.org') + self.assertEqual(site.code, 'commons') + self.assertIsInstance(site.namespaces, dict) + self.assertFalse(site.obsolete) + + self.assertRaises(KeyError, site.family.hostname, 'en') + + pywikibot.config.family = 'commons' + pywikibot.config.mylang = 'de' + + site2 = pywikibot.Site('en', 'commons') + self.assertEqual(site2.code, 'commons') + self.assertFalse(site2.obsolete) + self.assertEqual(site, site2) + self.assertEqual(pywikibot.config.mylang, 'de') + + site2 = pywikibot.Site('really_invalid', 'commons') + self.assertEqual(site2.code, 'commons') + self.assertFalse(site2.obsolete) + self.assertEqual(site, site2) + self.assertEqual(pywikibot.config.mylang, 'de') + + site2 = pywikibot.Site('de', 'commons') + self.assertEqual(site2.code, 'commons') + self.assertFalse(site2.obsolete) + self.assertEqual(site, site2) + # When the code is the same as config.mylang, Site() changes mylang + self.assertEqual(pywikibot.config.mylang, 'commons') + + def test_wikidata(self): + """Test Wikidata family, with sites for test and production.""" + site = self.get_site('wikidata') + self.assertEqual(site.hostname(), 'www.wikidata.org') + self.assertEqual(site.code, 'wikidata') + self.assertIsInstance(site.namespaces, dict) + self.assertFalse(site.obsolete) + + self.assertRaises(KeyError, site.family.hostname, 'en') + + pywikibot.config.family = 'wikidata' + pywikibot.config.mylang = 'en' + + site2 = pywikibot.Site('test') + self.assertEqual(site2.hostname(), 'test.wikidata.org') + self.assertEqual(site2.code, 'test') + + # Languages cant be used due to T71255 + self.assertRaises(pywikibot.UnknownSite, + pywikibot.Site, 'en', 'wikidata') + + if __name__ == '__main__': try: unittest.main() -- To view, visit https://gerrit.wikimedia.org/r/185150 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d1bcf23134a0543ababc8f14ffa4ecc284535fd Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: jenkins-bot <>

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits January 2015