jenkins-bot has submitted this change and it was merged.

Change subject: Use relative imports ......................................................................

Use relative imports

Change-Id: I4f741502ef804a2531715e16db6ae28d5b48eea9 --- M pywikibot/__init__.py M pywikibot/comms/http.py M pywikibot/family.py M pywikibot/i18n.py M pywikibot/pagegenerators.py M pywikibot/textlib.py M pywikibot/userinterfaces/terminal_interface.py M pywikibot/userinterfaces/terminal_interface_base.py M pywikibot/userinterfaces/terminal_interface_unix.py M pywikibot/userinterfaces/terminal_interface_win32.py 10 files changed, 15 insertions(+), 15 deletions(-)

Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified

diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index a91fed6..a348be5 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -400,8 +400,8 @@ getSite = Site # alias for backwards-compability

-from page import Page, ImagePage, Category, Link, User, ItemPage, PropertyPage, Claim -from page import html2unicode, url2unicode, unicode2html +from .page import Page, ImagePage, Category, Link, User, ItemPage, PropertyPage, Claim +from .page import html2unicode, url2unicode, unicode2html

link_regex = re.compile(r'[[(?P<title>[^]|[<>{}]*)(|.*?)?]]') diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index a4ad829..ada81cd 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -32,7 +32,7 @@ from pywikibot.exceptions import FatalServerError, Server504Error import pywikibot import cookielib -import threadedhttp +from . import threadedhttp import pywikibot.version

_logger = "comm.http" diff --git a/pywikibot/family.py b/pywikibot/family.py index 667309a..cc88490 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -13,7 +13,7 @@ import urllib import collections

-import config2 as config +from . import config2 as config import pywikibot

logger = logging.getLogger("pywiki.wiki.family") diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index f032e2e..92d3eb1 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -14,9 +14,9 @@ import re import locale from pywikibot import Error -from plural import plural_rules +from .plural import plural_rules import pywikibot -import config2 as config +from . import config2 as config

PLURAL_PATTERN = '{{PLURAL:(?:%()?([^)]*?)(?:)d)?|(.*?)}}'

diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 0a9d2ae..baccca5 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -25,8 +25,8 @@ import itertools import re import time - import pywikibot +from . import date from pywikibot import config from pywikibot import deprecate_arg, i18n from pywikibot.comms import http diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 0cdd3ba..92e66d0 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -21,7 +21,7 @@ import pywikibot import re from HTMLParser import HTMLParser -import config2 as config +from . import config2 as config

TEMP_REGEX = re.compile( '{{(?:msg:)?(?P<name>[^{|]+?)(?:|(?P<params>[^{]+?(?:{[^{]+?}[^{]*?)?))?}}') @@ -641,7 +641,7 @@ #---------------------------------------

def getCategoryLinks(text, site=None): - import catlib + from . import catlib """Return a list of category links found in text.

List contains Category objects. diff --git a/pywikibot/userinterfaces/terminal_interface.py b/pywikibot/userinterfaces/terminal_interface.py index e6353ff..0e8db29 100644 --- a/pywikibot/userinterfaces/terminal_interface.py +++ b/pywikibot/userinterfaces/terminal_interface.py @@ -9,6 +9,6 @@ import sys

if sys.platform == 'win32': - from terminal_interface_win32 import Win32UI as UI + from .terminal_interface_win32 import Win32UI as UI else: - from terminal_interface_unix import UnixUI as UI + from .terminal_interface_unix import UnixUI as UI diff --git a/pywikibot/userinterfaces/terminal_interface_base.py b/pywikibot/userinterfaces/terminal_interface_base.py index 9b1a656..a5d6ecb 100755 --- a/pywikibot/userinterfaces/terminal_interface_base.py +++ b/pywikibot/userinterfaces/terminal_interface_base.py @@ -6,7 +6,7 @@ # __version__ = '$Id$'

-import transliteration +from . import transliteration import traceback import re import sys diff --git a/pywikibot/userinterfaces/terminal_interface_unix.py b/pywikibot/userinterfaces/terminal_interface_unix.py index e8e7246..984a5e5 100755 --- a/pywikibot/userinterfaces/terminal_interface_unix.py +++ b/pywikibot/userinterfaces/terminal_interface_unix.py @@ -6,7 +6,7 @@ # __version__ = '$Id$'

-import terminal_interface_base +from . import terminal_interface_base

# TODO: other colors: #0 = Black diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py index d315fa7..d6e1d28 100755 --- a/pywikibot/userinterfaces/terminal_interface_win32.py +++ b/pywikibot/userinterfaces/terminal_interface_win32.py @@ -7,7 +7,7 @@ __version__ = '$Id$'

import re -import terminal_interface_base +from . import terminal_interface_base

try: import ctypes @@ -48,7 +48,7 @@ class Win32CtypesUI(Win32BaseUI): def __init__(self): Win32BaseUI.__init__(self) - from win32_unicode import stdin, stdout, stderr, argv + from .win32_unicode import stdin, stdout, stderr, argv self.stdin = stdin self.stdout = stdout self.stderr = stderr