Revision: 6130
Author: russblau
Date: 2008-12-04 21:13:11 +0000 (Thu, 04 Dec 2008)
Log Message:
-----------
More consistent use of pywikibot.config2 module
Modified Paths:
--------------
branches/rewrite/pywikibot/__init__.py
branches/rewrite/pywikibot/comms/http.py
branches/rewrite/pywikibot/login.py
branches/rewrite/pywikibot/page.py
branches/rewrite/pywikibot/site.py
Modified: branches/rewrite/pywikibot/__init__.py
===================================================================
--- branches/rewrite/pywikibot/__init__.py 2008-12-04 20:39:59 UTC (rev
6129)
+++ branches/rewrite/pywikibot/__init__.py 2008-12-04 21:13:11 UTC (rev
6130)
@@ -13,7 +13,7 @@
import logging
from exceptions import *
-import config2
+import config2 as config
import textlib
@@ -47,10 +47,7 @@
_sites = {}
-default_family = config2.family
-default_code = config2.mylang
-
@deprecate_arg("persistent_http", None)
def Site(code=None, fam=None, user=None, sysop=None, interface=None):
"""Return the specified Site object.
@@ -68,21 +65,21 @@
logger = logging.getLogger("wiki")
if code is None:
- code = default_code
+ code = config.mylang
if fam is None:
- fam = default_family
+ fam = config.family
if user is None:
try:
- user = config2.usernames[fam][code]
+ user = config.usernames[fam][code]
except KeyError:
user = None
if sysop is None:
try:
- sysop = config2.sysopnames[fam][code]
+ sysop = config.sysopnames[fam][code]
except KeyError:
sysop = None
if interface is None:
- interface = config2.site_interface
+ interface = config.site_interface
try:
exec "from site import %s as __Site" % interface
except ImportError:
@@ -96,6 +93,7 @@
getSite = Site # alias for backwards-compability
+
from page import Page, ImagePage, Category, Link
Modified: branches/rewrite/pywikibot/comms/http.py
===================================================================
--- branches/rewrite/pywikibot/comms/http.py 2008-12-04 20:39:59 UTC (rev
6129)
+++ branches/rewrite/pywikibot/comms/http.py 2008-12-04 21:13:11 UTC (rev
6130)
@@ -27,7 +27,7 @@
import logging
import atexit
-from pywikibot import config2
+from pywikibot import config
import cookielib
import threadedhttp
@@ -44,10 +44,10 @@
http_queue = Queue.Queue()
cookie_jar = threadedhttp.LockableCookieJar(
- config2.datafilepath("%s-%s-%s.lwp"
- % (config2.family,
- config2.mylang,
- config2.usernames[config2.family][config2.mylang])))
+ config.datafilepath("%s-%s-%s.lwp"
+ % (config.family,
+ config.mylang,
+ config.usernames[config.family][config.mylang])))
try:
cookie_jar.load()
except (IOError, cookielib.LoadError):
Modified: branches/rewrite/pywikibot/login.py
===================================================================
--- branches/rewrite/pywikibot/login.py 2008-12-04 20:39:59 UTC (rev 6129)
+++ branches/rewrite/pywikibot/login.py 2008-12-04 21:13:11 UTC (rev 6130)
@@ -47,6 +47,7 @@
import re
import urllib2
import pywikibot
+from pywikibot import config
from pywikibot.exceptions import *
logger = logging.getLogger("wiki")
@@ -77,7 +78,7 @@
self.username = user
elif sysop:
try:
- self.username = pywikibot.config2.sysopnames\
+ self.username = config.sysopnames\
[self.site.family.name][self.site.code]
except KeyError:
raise NoUsername(
@@ -89,7 +90,7 @@
'wiki_code': self.site.code})
else:
try:
- self.username = pywikibot.config2.usernames\
+ self.username = config.usernames\
[self.site.family.name][self.site.code]
except:
raise NoUsername(
@@ -100,7 +101,7 @@
% {'fam_name': self.site.family.name,
'wiki_code': self.site.code})
self.password = password
- if getattr(pywikibot.config2, 'password_file', ''):
+ if getattr(config, 'password_file', ''):
self.readPassword()
def botAllowed(self):
@@ -140,7 +141,7 @@
The argument data is the raw data, as returned by getCookie().
"""
- filename = pywikibot.config2.datafilepath('%s-%s-%s-login.data'
+ filename = config.datafilepath('%s-%s-%s-login.data'
% (self.site.family.name, self.site.code,
self.username))
f = open(filename, 'w')
@@ -163,7 +164,7 @@
("en", "wikipedia", "my_en_user", "my_en_pass")
"""
- file = open(pywikibot.config2.password_file)
+ file = open(config.password_file)
for line in file:
if not line.strip(): continue
entry = eval(line)
@@ -238,9 +239,9 @@
return
if logall:
if sysop:
- namedict = pywikibot.config2.sysopnames
+ namedict = config.sysopnames
else:
- namedict = pywikibot.config2.usernames
+ namedict = config.usernames
for familyName in namedict.iterkeys():
for lang in namedict[familyName].iterkeys():
try:
Modified: branches/rewrite/pywikibot/page.py
===================================================================
--- branches/rewrite/pywikibot/page.py 2008-12-04 20:39:59 UTC (rev 6129)
+++ branches/rewrite/pywikibot/page.py 2008-12-04 21:13:11 UTC (rev 6130)
@@ -11,6 +11,7 @@
import pywikibot
from pywikibot import deprecate_arg
+from pywikibot import config
import pywikibot.textlib
import htmlentitydefs
@@ -181,9 +182,9 @@
title = urllib.quote(encodedTitle)
if asLink:
if forceInterwiki or (allowInterwiki and
- (self.site().family.name != pywikibot.default_family
- or self.site().code != pywikibot.default_code)):
- if self.site().family.name != pywikibot.default_family \
+ (self.site().family.name != config.family
+ or self.site().code != config.mylang)):
+ if self.site().family.name != config.family \
and self.site().family.name != self.site().code:
return u'[[%s:%s:%s]]' % (self.site().family.name,
self.site().code,
@@ -572,7 +573,7 @@
user_config.py, or using page.put(force=True).
""" # TODO: move this to Site object?
- if pywikibot.config2.ignore_bot_templates: #Check the "master ignore
switch"
+ if config.ignore_bot_templates: #Check the "master ignore switch"
return True
try:
templates = self.templatesWithParams();
Modified: branches/rewrite/pywikibot/site.py
===================================================================
--- branches/rewrite/pywikibot/site.py 2008-12-04 20:39:59 UTC (rev 6129)
+++ branches/rewrite/pywikibot/site.py 2008-12-04 21:13:11 UTC (rev 6130)
@@ -12,6 +12,7 @@
import pywikibot
from pywikibot import deprecate_arg
+from pywikibot import config
from pywikibot.throttle import Throttle
from pywikibot.data import api
from pywikibot.exceptions import *
@@ -45,14 +46,14 @@
"""
if fam == None:
- fam = pywikibot.default_family
+ fam = config.family
try:
# first try the built-in families
exec "import pywikibot.families.%s_family as myfamily" % fam
except ImportError:
# next see if user has defined a local family module
try:
- sys.path.append(pywikibot.config2.datafilepath('families'))
+ sys.path.append(config.datafilepath('families'))
exec "import %s_family as myfamily" % fam
except ImportError:
if fatal:
@@ -2485,7 +2486,7 @@
try:
if sysop:
try:
- username = pywikibot.config2.sysopnames[self.family.name
+ username = config.sysopnames[self.family.name
][self.code]
except KeyError:
raise NoUsername("""\
@@ -2502,7 +2503,7 @@
else:
tmp = '%s-%s-%s-login.data' % (
self.family.name, self.code, username)
- fn = pywikibot.config2.datafilepath('login-data', tmp)
+ fn = config.datafilepath('login-data', tmp)
if not os.path.exists(fn):
self._cookies[index] = None
self._isLoggedIn[index] = False
_______________________________________________
Pywikipedia-l mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikipedia-l
