Revision: 6524
Author: nicdumz
Date: 2009-03-20 16:11:48 +0000 (Fri, 20 Mar 2009)
Log Message:
-----------
Hehe... nice code duplication. Removing everywhere the extra imports of wikipedia; using
self.name instead of wikipedia.default_family
Modified Paths:
--------------
trunk/pywikipedia/families/wikinews_family.py
trunk/pywikipedia/families/wikipedia_family.py
trunk/pywikipedia/families/wikiquote_family.py
trunk/pywikipedia/families/wikisource_family.py
trunk/pywikipedia/families/wikiversity_family.py
trunk/pywikipedia/families/wiktionary_family.py
Modified: trunk/pywikipedia/families/wikinews_family.py
===================================================================
--- trunk/pywikipedia/families/wikinews_family.py 2009-03-20 16:02:48 UTC (rev 6523)
+++ trunk/pywikipedia/families/wikinews_family.py 2009-03-20 16:11:48 UTC (rev 6524)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import urllib
-import family, config, wikipedia
+import family, config
__version__ = '$Id$'
@@ -17,7 +17,7 @@
'th', 'bs', 'ar', 'bg', 'ta',
'cs', 'hu',
]
- if config.SSL_connection and wikipedia.default_family in
config.available_ssl_project:
+ if config.SSL_connection and self.name in config.available_ssl_project:
for lang in self.languages_by_size:
self.langs[lang] = 'secure.wikimedia.org'
else:
Modified: trunk/pywikipedia/families/wikipedia_family.py
===================================================================
--- trunk/pywikipedia/families/wikipedia_family.py 2009-03-20 16:02:48 UTC (rev 6523)
+++ trunk/pywikipedia/families/wikipedia_family.py 2009-03-20 16:11:48 UTC (rev 6524)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import urllib
-import family, config, wikipedia
+import family, config
__version__ = '$Id$'
@@ -40,7 +40,7 @@
'myv', 'sah', 'srn', 'szl', 'arz',
]
- if config.SSL_connection and wikipedia.default_family in
config.available_ssl_project:
+ if config.SSL_connection and self.name in config.available_ssl_project:
for lang in self.languages_by_size:
self.langs[lang] = 'secure.wikimedia.org'
else:
Modified: trunk/pywikipedia/families/wikiquote_family.py
===================================================================
--- trunk/pywikipedia/families/wikiquote_family.py 2009-03-20 16:02:48 UTC (rev 6523)
+++ trunk/pywikipedia/families/wikiquote_family.py 2009-03-20 16:11:48 UTC (rev 6524)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import urllib
-import family, config, wikipedia
+import family, config
__version__ = '$Id$'
@@ -23,7 +23,7 @@
'ga', 'cr', 'nds', 'kk', 'kr',
'als', 'za', 'ks',
]
- if config.SSL_connection and wikipedia.default_family in
config.available_ssl_project:
+ if config.SSL_connection and self.name in config.available_ssl_project:
for lang in self.languages_by_size:
self.langs[lang] = 'secure.wikimedia.org'
else:
Modified: trunk/pywikipedia/families/wikisource_family.py
===================================================================
--- trunk/pywikipedia/families/wikisource_family.py 2009-03-20 16:02:48 UTC (rev 6523)
+++ trunk/pywikipedia/families/wikisource_family.py 2009-03-20 16:11:48 UTC (rev 6524)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import urllib
-import family, config, wikipedia
+import family, config
__version__ = '$Id$'
@@ -23,7 +23,7 @@
self.langs = {
'-': 'wikisource.org',
}
- if config.SSL_connection and wikipedia.default_family in
config.available_ssl_project:
+ if config.SSL_connection and self.name in config.available_ssl_project:
for lang in self.languages_by_size:
self.langs[lang] = 'secure.wikimedia.org'
else:
Modified: trunk/pywikipedia/families/wikiversity_family.py
===================================================================
--- trunk/pywikipedia/families/wikiversity_family.py 2009-03-20 16:02:48 UTC (rev 6523)
+++ trunk/pywikipedia/families/wikiversity_family.py 2009-03-20 16:11:48 UTC (rev 6524)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import urllib
-import family, config, wikipedia
+import family, config
__version__ = '$Id$'
@@ -18,7 +18,7 @@
self.langs = {
'beta': 'beta.wikiversity.org',
}
- if config.SSL_connection and wikipedia.default_family in
config.available_ssl_project:
+ if config.SSL_connection and self.name in config.available_ssl_project:
for lang in self.languages_by_size:
self.langs[lang] = 'secure.wikimedia.org'
else:
Modified: trunk/pywikipedia/families/wiktionary_family.py
===================================================================
--- trunk/pywikipedia/families/wiktionary_family.py 2009-03-20 16:02:48 UTC (rev 6523)
+++ trunk/pywikipedia/families/wiktionary_family.py 2009-03-20 16:11:48 UTC (rev 6524)
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
import urllib
-import family, config, wikipedia
+import family, config
__version__ = '$Id$'
@@ -29,7 +29,7 @@
'om', 'ln', 'sm', 'za', 'roa-rup',
'dz', 'my', 'wa',
]
- if config.SSL_connection and wikipedia.default_family in
config.available_ssl_project:
+ if config.SSL_connection and self.name in config.available_ssl_project:
for lang in self.languages_by_size:
self.langs[lang] = 'secure.wikimedia.org'
else: