jenkins-bot merged this change.

View Change

Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified
[cleanup] notes cleanup

- move development notes in front of its function in pwb.py
- remove outdatet note in bot.py and move loging mode to _logger string
- remove TODO note in aspects which is T203921 now

Change-Id: I09866ec00a264e9650e0bc43f42b9907923d05e2
---
M pwb.py
M pywikibot/bot.py
M tests/aspects.py
3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/pwb.py b/pwb.py
index 371b9e0..b71a78d 100755
--- a/pwb.py
+++ b/pwb.py
@@ -15,13 +15,6 @@
#
from __future__ import absolute_import, print_function, unicode_literals

-# The following snippet was developed by Ned Batchelder (and others)
-# for coverage [1], with python 3 support [2] added later,
-# and is available under the BSD license (see [3])
-# [1] https://bitbucket.org/ned/coveragepy/src/b5abcee50dbe/coverage/execfile.py
-# [2] https://bitbucket.org/ned/coveragepy/src/fd5363090034/coverage/execfile.py
-# [3] https://bitbucket.org/ned/coveragepy/src/2c5fb3a8b81c/setup.py?at=default#cl-31
-
import os
import sys
import types
@@ -76,6 +69,16 @@
pwb = pywikibot


+# The following snippet was developed by Ned Batchelder (and others)
+# for coverage [1], with python 3 support [2] added later,
+# and is available under the BSD license (see [3])
+# [1]
+# https://bitbucket.org/ned/coveragepy/src/b5abcee50dbe/coverage/execfile.py
+# [2]
+# https://bitbucket.org/ned/coveragepy/src/fd5363090034/coverage/execfile.py
+# [3]
+# https://bitbucket.org/ned/coveragepy/src/2c5fb3a8b81c/setup.py?at=default#cl-31
+
def run_python_file(filename, argv, argvu, package=None):
"""Run a python file as if it were the main program on the command line.

diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index faaad1c..ddeeeb8 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -54,10 +54,6 @@
#
from __future__ import absolute_import, unicode_literals

-# Note: the intention is to develop this module (at some point) into a Bot
-# class definition that can be subclassed to create new, functional bot
-# scripts, instead of writing each one from scratch.
-
__all__ = (
'CRITICAL', 'ERROR', 'INFO', 'WARNING', 'DEBUG', 'INPUT', 'STDOUT',
'VERBOSE', 'critical', 'debug', 'error', 'exception', 'log', 'warning',
@@ -81,7 +77,6 @@
'WikidataBot',
)

-# Note: all output goes thru python std library "logging" module

import codecs
import datetime
@@ -126,6 +121,7 @@
from pywikibot.tools.formatter import color_format


+# Note: all output goes thru python std library "logging" module
_logger = 'bot'

if not PY2:
diff --git a/tests/aspects.py b/tests/aspects.py
index 1d7c9ee..331d633 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -12,17 +12,6 @@
# Distributed under the terms of the MIT license.
#
from __future__ import absolute_import, print_function, unicode_literals
-# TODO:
-# skip if the user is blocked.
-# sysop flag, implement in site & page, and
-# possibly some of the script tests.
-# slow flag
-# weblib - also slow
-# (this class, and a FastTest, could error/pass based
-# it consumed more than a specified amount of time allowed.)
-# net flag should disable network libraries
-# UITestCase:
-# Not integrated; direct subclass of unittest.TestCase.
import inspect
import itertools
import os

To view, visit change 459400. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I09866ec00a264e9650e0bc43f42b9907923d05e2
Gerrit-Change-Number: 459400
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki@gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb@gmail.com>
Gerrit-Reviewer: jenkins-bot (75)