Pywikipedia-svn June 2013

pywikipedia-svn@lists.wikimedia.org

8 participants
103 discussions

SVN: [11704] branches/rewrite/scripts/i18n/weblinkchecker.py
by siebrand＠svn.wikimedia.org 30 Jun '13

30 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11704 Revision: 11704 Author: siebrand Date: 2013-06-30 17:01:59 +0000 (Sun, 30 Jun 2013) Log Message: ----------- Localisation updates from http://translatewiki.net. Modified Paths: -------------- branches/rewrite/scripts/i18n/weblinkchecker.py Modified: branches/rewrite/scripts/i18n/weblinkchecker.py =================================================================== --- branches/rewrite/scripts/i18n/weblinkchecker.py 2013-06-30 12:20:15 UTC (rev 11703) +++ branches/rewrite/scripts/i18n/weblinkchecker.py 2013-06-30 17:01:59 UTC (rev 11704) @@ -327,8 +327,10 @@ }, # Author: Dbc334 'sl': { + 'weblinkchecker-archive_msg': u'Spletno stran je shranil Internet Archive. Prosimo, razmislite o povezavi na ustrezno arhivirano različico: [%(URL)s].', 'weblinkchecker-caption': u'Mrtva povezava', 'weblinkchecker-summary': u'Robot: Poročanje o nedosegljivi zunanji povezavi', + 'weblinkchecker-report': u'Med več samodejnimi zaganjanji je bot ugotovil, da naslednja zunanja povezava ni na voljo. Prosimo, preverite, ali povezava zares ne deluje, in jo v tem primeru popravite ali odstranite.', }, # Author: Rancher 'sr': {

1 0

SVN: [11703] branches/rewrite/pywikibot/__init__.py
by multichill＠svn.wikimedia.org 30 Jun '13

30 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11703 Revision: 11703 Author: multichill Date: 2013-06-30 12:20:15 +0000 (Sun, 30 Jun 2013) Log Message: ----------- Globe can be null like at https://www.wikidata.org/w/api.php?action=wbgetentities&ids=Q9831&format=js… . Than "data['globe']"==None so globes[data['globe']] will throw a Keyerror. Changed it to default to earth when it's null. Modified Paths: -------------- branches/rewrite/pywikibot/__init__.py Modified: branches/rewrite/pywikibot/__init__.py =================================================================== --- branches/rewrite/pywikibot/__init__.py 2013-06-30 02:03:30 UTC (rev 11702) +++ branches/rewrite/pywikibot/__init__.py 2013-06-30 12:20:15 UTC (rev 11703) @@ -164,9 +164,17 @@ for k in site.globes(): globes[site.globes()[k]] = k + globekey = data['globe'] + if globekey: + # FIXME: Should probably use get() with some error handling when it's an unknown globe + globe = globes[data['globe']] + else: + # Default to earth or should we use None here? + globe = 'earth' + return Coordinate(data['latitude'], data['longitude'], data['altitude'], data['precision'], - globes[data['globe']], site=site) + globe, site=site) @property def precision(self):

1 0

SVN: [11702] branches/rewrite/pywikibot/page.py
by legoktm＠svn.wikimedia.org 29 Jun '13

29 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11702 Revision: 11702 Author: legoktm Date: 2013-06-30 02:03:30 +0000 (Sun, 30 Jun 2013) Log Message: ----------- Update documentation, ItemPage.getSiteLink() returns a string Modified Paths: -------------- branches/rewrite/pywikibot/page.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2013-06-30 01:47:43 UTC (rev 11701) +++ branches/rewrite/pywikibot/page.py 2013-06-30 02:03:30 UTC (rev 11702) @@ -2510,7 +2510,7 @@ def getSitelink(self, site, force=False): """ - Returns a page object for the specific site + Returns the title (unicode string) for the specific site site is a pywikibot.Site or database name force will override caching If the item doesn't have that language, raise NoPage

1 0

SVN: [11701] branches/rewrite
by legoktm＠svn.wikimedia.org 29 Jun '13

29 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11701 Revision: 11701 Author: legoktm Date: 2013-06-30 01:47:43 +0000 (Sun, 30 Jun 2013) Log Message: ----------- Implement WikibasePage.__cmp__ with a unit test. Modified Paths: -------------- branches/rewrite/pywikibot/page.py branches/rewrite/tests/page_tests.py Modified: branches/rewrite/pywikibot/page.py =================================================================== --- branches/rewrite/pywikibot/page.py 2013-06-29 09:14:29 UTC (rev 11700) +++ branches/rewrite/pywikibot/page.py 2013-06-30 01:47:43 UTC (rev 11701) @@ -2237,6 +2237,25 @@ self.repo = self.site self._isredir = False # Wikibase pages cannot be a redirect + def __cmp__(self, other): + """Test for equality and inequality of WikibasePage objects. + + Page objects are "equal" if and only if they are on the same site + and have the same normalized title, including section if any. + + Page objects are sortable by namespace first, then by title. + + This is basically the same as Page.__cmp__ but slightly different. + """ + if not isinstance(other, Page): + # especially, return -1 if other is None + return -1 + if self.site != other.site: + return cmp(self.site, other.site) + if self.namespace() != other.namespace(): + return cmp(self.namespace(), other.namespace()) + return cmp(self.title(), other.title()) + def title(self, **kwargs): if self.namespace() == 0: self._link._text = self.getID() Modified: branches/rewrite/tests/page_tests.py =================================================================== --- branches/rewrite/tests/page_tests.py 2013-06-29 09:14:29 UTC (rev 11700) +++ branches/rewrite/tests/page_tests.py 2013-06-30 01:47:43 UTC (rev 11701) @@ -315,6 +315,9 @@ claim.setTarget(pywikibot.ItemPage(repo, 'q1')) self.assertEqual(claim._formatDataValue(), {'entity-type': 'item', 'numeric-id': 1}) + # test WikibasePage.__cmp__ + self.assertEqual(pywikibot.ItemPage.fromPage(mainpage), pywikibot.ItemPage(repo, 'q5296')) + def testItemPageExtensionability(self): class MyItemPage(pywikibot.ItemPage): pass

1 0

SVN: [11700] branches/rewrite
by legoktm＠svn.wikimedia.org 29 Jun '13

29 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11700 Revision: 11700 Author: legoktm Date: 2013-06-29 09:14:29 +0000 (Sat, 29 Jun 2013) Log Message: ----------- Write a constructor to create Site objects from their dbname, only for some WMF sites. Modified Paths: -------------- branches/rewrite/pywikibot/site.py branches/rewrite/tests/site_tests.py Modified: branches/rewrite/pywikibot/site.py =================================================================== --- branches/rewrite/pywikibot/site.py 2013-06-28 08:24:28 UTC (rev 11699) +++ branches/rewrite/pywikibot/site.py 2013-06-29 09:14:29 UTC (rev 11700) @@ -729,6 +729,24 @@ self._loginstatus = LoginStatus.NOT_ATTEMPTED return + @staticmethod + def fromDBName(dbname): + # TODO this only works for some WMF sites + req = api.CachedRequest(datetime.timedelta(days=10), + site=pywikibot.Site('meta', 'meta'), + action='sitematrix') + data = req.submit() + for num in data['sitematrix']: + if num in ['specials', 'count']: + continue + lang = data['sitematrix'][num]['code'] + for site in data['sitematrix'][num]['site']: + if site['dbname'] == dbname: + if site['code'] == 'wiki': + site['code'] = 'wikipedia' + return APISite(lang, site['code']) + raise ValueError("Cannot parse a site out of %s." % dbname) + def _generator(self, gen_class, type_arg=None, namespaces=None, step=None, total=None, **args): """Convenience method that returns an API generator. Modified: branches/rewrite/tests/site_tests.py =================================================================== --- branches/rewrite/tests/site_tests.py 2013-06-28 08:24:28 UTC (rev 11699) +++ branches/rewrite/tests/site_tests.py 2013-06-29 09:14:29 UTC (rev 11700) @@ -66,6 +66,15 @@ "nosuchright"): self.assertType(mysite.has_right(rgt), bool) + def testConstructors(self): + """Test cases for site constructors""" + self.assertEqual(pywikibot.site.APISite.fromDBName('enwiki'), pywikibot.Site('en', 'wikipedia')) + self.assertEqual(pywikibot.site.APISite.fromDBName('eswikisource'), pywikibot.Site('es', 'wikisource')) + self.assertEqual(pywikibot.site.APISite.fromDBName('dewikinews'), pywikibot.Site('de', 'wikinews')) + self.assertEqual(pywikibot.site.APISite.fromDBName('ukwikivoyage'), pywikibot.Site('uk', 'wikivoyage')) + + self.assertRaises(ValueError, pywikibot.site.APISite.fromDBName, 'metawiki') + def testLanguageMethods(self): """Test cases for languages() and related methods"""

1 0

SVN: [11699] branches/rewrite/tests/i18n_tests.py
by legoktm＠svn.wikimedia.org 28 Jun '13

28 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11699 Revision: 11699 Author: legoktm Date: 2013-06-28 08:24:28 +0000 (Fri, 28 Jun 2013) Log Message: ----------- Fix twtranslate tests by temporarily moving tests/i18n/test.py into scripts/i18n/ when running Modified Paths: -------------- branches/rewrite/tests/i18n_tests.py Modified: branches/rewrite/tests/i18n_tests.py =================================================================== --- branches/rewrite/tests/i18n_tests.py 2013-06-28 07:54:39 UTC (rev 11698) +++ branches/rewrite/tests/i18n_tests.py 2013-06-28 08:24:28 UTC (rev 11699) @@ -7,8 +7,11 @@ __version__ = '$Id$' import unittest +import os from pywikibot import i18n +import shutil + class TestTranslate(unittest.TestCase): def setUp(self): self.msg_localized = {'en': u'test-localized EN', @@ -17,7 +20,7 @@ self.msg_semi_localized = {'en': u'test-semi-localized EN', 'nl': u'test-semi-localized NL'} self.msg_non_localized = {'en': u'test-non-localized EN'} - self.msg_no_english = {'ja': u'test-no-english JA'} + self.msg_no_english = {'ja': u'test-no-english JA'} def testLocalized(self): self.assertEqual(i18n.translate('en', self.msg_localized), @@ -55,6 +58,13 @@ class TestTWTranslate(unittest.TestCase): + def setUp(self): + self.path = os.path.realpath(__file__)[:-13] + shutil.copyfile(self.path + 'i18n/test.py', self.path + '../scripts/i18n/test.py') + + def tearDown(self): + os.remove(self.path + '../scripts/i18n/test.py') + def testLocalized(self): self.assertEqual(i18n.twtranslate('en', 'test-localized'), u'test-localized EN')

1 0

SVN: [11698] branches/rewrite/tests/dry_site_tests.py
by legoktm＠svn.wikimedia.org 28 Jun '13

28 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11698 Revision: 11698 Author: legoktm Date: 2013-06-28 07:54:39 +0000 (Fri, 28 Jun 2013) Log Message: ----------- Convert to unittest module, all tests currently passing Modified Paths: -------------- branches/rewrite/tests/dry_site_tests.py Modified: branches/rewrite/tests/dry_site_tests.py =================================================================== --- branches/rewrite/tests/dry_site_tests.py 2013-06-28 02:24:51 UTC (rev 11697) +++ branches/rewrite/tests/dry_site_tests.py 2013-06-28 07:54:39 UTC (rev 11698) @@ -1,28 +1,33 @@ import pywikibot +import unittest + class DrySite(pywikibot.site.APISite): @property def userinfo(self): return self._userinfo -def test_logged_in(): - x = DrySite('en') - - x._userinfo = {'name': None, 'groups': []} - x._username = ['normal_user', 'sysop_user'] - assert not x.logged_in(True) - assert not x.logged_in(False) - - x._userinfo['name'] = 'normal_user' - assert not x.logged_in(True) - assert x.logged_in(False) - - x._userinfo['name'] = 'sysop_user' - x._userinfo['groups'] = ['sysop'] - assert x.logged_in(True) - assert not x.logged_in(False) +class TestDrySite(unittest.TestCase): + def test_logged_in(self): + x = DrySite('en') + x._userinfo = {'name': None, 'groups': []} + x._username = ['normal_user', 'sysop_user'] + + self.assertFalse(x.logged_in(True)) + self.assertFalse(x.logged_in(False)) + + x._userinfo['name'] = 'normal_user' + self.assertFalse(x.logged_in(True)) + self.assertTrue(x.logged_in(False)) + + x._userinfo['name'] = 'sysop_user' + x._userinfo['groups'] = ['sysop'] + self.assertTrue(x.logged_in(True)) + self.assertFalse(x.logged_in(False)) + + class SiteMock(object): last_login = None last_fn_called = False @@ -32,20 +37,23 @@ def inner_fn(self, *args, **kwargs): self.last_fn_called = (args, kwargs) - return (args, kwargs) + return args, kwargs -def test_must_be_user(): - x = SiteMock() - wrapped_inner = pywikibot.site.must_be(group='user')(x.inner_fn) - assert(wrapped_inner(x,1,2,3,a='a', b='b') == ((x,1,2,3), {'a': 'a', 'b': 'b'})) - assert(x.last_fn_called == ((x,1,2,3), {'a': 'a', 'b': 'b'})) - assert(x.last_login == 'user') -def test_must_be_sysop(): - x = SiteMock() - wrapped_inner = pywikibot.site.must_be(group='sysop')(x.inner_fn) - assert(wrapped_inner(x,1,2,3,a='a', b='b') == ((x,1,2,3), {'a': 'a', 'b': 'b'})) - assert(x.last_fn_called == ((x,1,2,3), {'a': 'a', 'b': 'b'})) - assert(x.last_login == 'sysop') +class TestSiteMock(unittest.TestCase): + def test_must_be_user(self): + x = SiteMock() + wrapped_inner = pywikibot.site.must_be(group='user')(x.inner_fn) + self.assertEqual(wrapped_inner(x,1,2,3,a='a', b='b'), ((x,1,2,3), {'a': 'a', 'b': 'b'})) + self.assertEqual(x.last_fn_called, ((x,1,2,3), {'a': 'a', 'b': 'b'})) + self.assertEqual(x.last_login, 'user') + def test_must_be_sysop(self): + x = SiteMock() + wrapped_inner = pywikibot.site.must_be(group='sysop')(x.inner_fn) + self.assertEqual(wrapped_inner(x,1,2,3,a='a', b='b'), ((x,1,2,3), {'a': 'a', 'b': 'b'})) + self.assertEqual(x.last_fn_called, ((x,1,2,3), {'a': 'a', 'b': 'b'})) + self.assertEqual(x.last_login, 'sysop') +if __name__ == '__main__': + unittest.main()

1 0

SVN: [11697] branches/rewrite/tests/dry_api_tests.py
by legoktm＠svn.wikimedia.org 27 Jun '13

27 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11697 Revision: 11697 Author: legoktm Date: 2013-06-28 02:24:51 +0000 (Fri, 28 Jun 2013) Log Message: ----------- Convert to use unittests module Modified Paths: -------------- branches/rewrite/tests/dry_api_tests.py Modified: branches/rewrite/tests/dry_api_tests.py =================================================================== --- branches/rewrite/tests/dry_api_tests.py 2013-06-28 02:09:18 UTC (rev 11696) +++ branches/rewrite/tests/dry_api_tests.py 2013-06-28 02:24:51 UTC (rev 11697) @@ -1,40 +1,41 @@ import datetime import pywikibot from pywikibot.data.api import CachedRequest +import unittest -parms = {'site': pywikibot.getSite('en'), - 'action': 'query', - 'meta': 'userinfo'} -req = CachedRequest(expiry=1, **parms) -expreq = CachedRequest(expiry=0, **parms) -diffreq = CachedRequest(expiry=1, site=pywikibot.getSite('en'), action='query', meta='siteinfo') -diffsite = CachedRequest(expiry=1, site=pywikibot.getSite('de'), action='query', meta='userinfo') +class DryAPITests(unittest.TestCase): + def setUp(self): + self.parms = {'site': pywikibot.Site('en'), + 'action': 'query', + 'meta': 'userinfo'} + self.req = CachedRequest(expiry=1, **self.parms) + self.expreq = CachedRequest(expiry=0, **self.parms) + self.diffreq = CachedRequest(expiry=1, site=pywikibot.Site('en'), action='query', meta='siteinfo') + self.diffsite = CachedRequest(expiry=1, site=pywikibot.Site('de'), action='query', meta='userinfo') -def test_expiry_formats(): - import datetime - assert(req.expiry == CachedRequest(datetime.timedelta(days=1), **parms).expiry) + def test_expiry_formats(self): + self.assertEqual(self.req.expiry, CachedRequest(datetime.timedelta(days=1), **self.parms).expiry) + def test_get_cache_dir(self): + retval = self.req._get_cache_dir() + self.assertIn('apicache', retval) -def test_get_cache_dir(): - retval = req._get_cache_dir() - assert('apicache' in retval) + def test_create_file_name(self): + self.assertEqual(self.req._create_file_name(), self.req._create_file_name()) + self.assertEqual(self.req._create_file_name(), self.expreq._create_file_name()) + self.assertNotEqual(self.req._create_file_name(), self.diffreq._create_file_name()) + def test_cachefile_path(self): + self.assertEqual(self.req._cachefile_path(), self.req._cachefile_path()) + self.assertEqual(self.req._cachefile_path(), self.expreq._cachefile_path()) + self.assertNotEqual(self.req._cachefile_path(), self.diffreq._cachefile_path()) + self.assertNotEqual(self.req._cachefile_path(), self.diffsite._cachefile_path()) -def test_create_file_name(): - assert(req._create_file_name() == req._create_file_name()) - assert(req._create_file_name() == expreq._create_file_name()) - assert(req._create_file_name() != diffreq._create_file_name()) + def test_expired(self): + self.assertFalse(self.req._expired(datetime.datetime.now())) + self.assertTrue(self.req._expired(datetime.datetime.now() - datetime.timedelta(days=2))) - -def test_cachefile_path(): - assert(req._cachefile_path() == req._cachefile_path()) - assert(req._cachefile_path() == expreq._cachefile_path()) - assert(req._cachefile_path() != diffreq._cachefile_path()) - assert(req._cachefile_path() != diffsite._cachefile_path()) - - -def test_expired(): - assert(not req._expired(datetime.datetime.now())) - assert(req._expired(datetime.datetime.now() - datetime.timedelta(days=2))) +if __name__ == '__main__': + unittest.main()

1 0

SVN: [11696] branches/rewrite/tests
by legoktm＠svn.wikimedia.org 27 Jun '13

27 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11696 Revision: 11696 Author: legoktm Date: 2013-06-28 02:09:18 +0000 (Fri, 28 Jun 2013) Log Message: ----------- pep8 fixes Modified Paths: -------------- branches/rewrite/tests/__init__.py branches/rewrite/tests/api_tests.py branches/rewrite/tests/dry_api_tests.py Modified: branches/rewrite/tests/__init__.py =================================================================== --- branches/rewrite/tests/__init__.py 2013-06-27 19:38:50 UTC (rev 11695) +++ branches/rewrite/tests/__init__.py 2013-06-28 02:09:18 UTC (rev 11696) @@ -11,27 +11,29 @@ from pywikibot.data.api import Request as _original_Request from pywikibot.data.api import CachedRequest + class TestRequest(CachedRequest): def __init__(self, *args, **kwargs): super(TestRequest, self).__init__(0, *args, **kwargs) - + def _get_cache_dir(self): path = os.path.join(os.path.split(__file__)[0], 'apicache') self._make_dir(path) return path - + def _expired(self, dt): return False - + def submit(self): cached_available = self._load_cache() if not cached_available: print str(self) return super(TestRequest, self).submit() - + + def patch_request(): pywikibot.data.api.Request = TestRequest - + + def unpatch_request(): pywikibot.data.api.Request = _original_Request - Modified: branches/rewrite/tests/api_tests.py =================================================================== --- branches/rewrite/tests/api_tests.py 2013-06-27 19:38:50 UTC (rev 11695) +++ branches/rewrite/tests/api_tests.py 2013-06-28 02:09:18 UTC (rev 11696) @@ -44,21 +44,21 @@ "ns": 0, "title": "Broadcaster.com" }, - "13918157": {"pageid": 13918157, - "ns": 0, - "title": "Broadcaster (definition)" - }, + "13918157": {"pageid": 13918157, + "ns": 0, + "title": "Broadcaster (definition)" + }, "156658": {"pageid": 156658, "ns": 0, "title": "Wiktionary" }, - "47757": {"pageid": 47757, - "ns": 4, - "title": "Wikipedia:Disambiguation" - } + "47757": {"pageid": 47757, + "ns": 4, + "title": "Wikipedia:Disambiguation" + } } } - } + } def testGeneratorResults(self): """Test that PageGenerator yields pages with expected attributes.""" Modified: branches/rewrite/tests/dry_api_tests.py =================================================================== --- branches/rewrite/tests/dry_api_tests.py 2013-06-27 19:38:50 UTC (rev 11695) +++ branches/rewrite/tests/dry_api_tests.py 2013-06-28 02:09:18 UTC (rev 11696) @@ -11,28 +11,30 @@ diffreq = CachedRequest(expiry=1, site=pywikibot.getSite('en'), action='query', meta='siteinfo') diffsite = CachedRequest(expiry=1, site=pywikibot.getSite('de'), action='query', meta='userinfo') + def test_expiry_formats(): - import datetime - assert(req.expiry == CachedRequest(datetime.timedelta(days=1), **parms).expiry) + import datetime + assert(req.expiry == CachedRequest(datetime.timedelta(days=1), **parms).expiry) + def test_get_cache_dir(): - retval = req._get_cache_dir() - assert('apicache' in retval) - + retval = req._get_cache_dir() + assert('apicache' in retval) + + def test_create_file_name(): assert(req._create_file_name() == req._create_file_name()) assert(req._create_file_name() == expreq._create_file_name()) assert(req._create_file_name() != diffreq._create_file_name()) - + + def test_cachefile_path(): assert(req._cachefile_path() == req._cachefile_path()) assert(req._cachefile_path() == expreq._cachefile_path()) assert(req._cachefile_path() != diffreq._cachefile_path()) assert(req._cachefile_path() != diffsite._cachefile_path()) - + + def test_expired(): assert(not req._expired(datetime.datetime.now())) assert(req._expired(datetime.datetime.now() - datetime.timedelta(days=2))) - - - \ No newline at end of file

1 0

SVN: [11695] branches/rewrite/tests/ui_tests.py
by legoktm＠svn.wikimedia.org 27 Jun '13

27 Jun '13

http://www.mediawiki.org/wiki/Special:Code/pywikipedia/11695 Revision: 11695 Author: legoktm Date: 2013-06-27 19:38:50 +0000 (Thu, 27 Jun 2013) Log Message: ----------- pep8 fixes Modified Paths: -------------- branches/rewrite/tests/ui_tests.py Modified: branches/rewrite/tests/ui_tests.py =================================================================== --- branches/rewrite/tests/ui_tests.py 2013-06-24 17:04:14 UTC (rev 11694) +++ branches/rewrite/tests/ui_tests.py 2013-06-27 19:38:50 UTC (rev 11695) @@ -13,30 +13,39 @@ import cStringIO import StringIO import logging -import os, sys +import os +import sys if os.name == "nt": from multiprocessing.managers import BaseManager - import threading, win32clipboard + import threading + import win32clipboard + class pywikibotWrapper(object): def init(self): import pywikibot + def output(self, *args, **kwargs): import pywikibot return pywikibot.output(*args, **kwargs) + def request_input(self, *args, **kwargs): import pywikibot self.input = None + def threadedinput(): self.input = pywikibot.input(*args, **kwargs) self.inputthread = threading.Thread(target=threadedinput) self.inputthread.start() + def get_input(self): self.inputthread.join() return self.input + def set_config(self, key, value): import pywikibot setattr(pywikibot.config, key, value) + def set_ui(self, key, value): import pywikibot setattr(pywikibot.ui, key, value) @@ -322,39 +331,41 @@ class TestWindowsTerminalUnicode(UITestCase): @classmethod def setUpClass(cls): - import subprocess, inspect, pywinauto + import inspect + import pywinauto + import subprocess si = subprocess.STARTUPINFO() si.dwFlags = subprocess.STARTF_USESTDHANDLES fn = inspect.getfile(inspect.currentframe()) cls._process = subprocess.Popen(["python", "pwb.py", fn, "--run-as-slave-interpreter"], - creationflags = subprocess.CREATE_NEW_CONSOLE) + creationflags=subprocess.CREATE_NEW_CONSOLE) _manager.connect() cls.pywikibot = _manager.pywikibot() cls._app = pywinauto.application.Application() - cls._app.connect_(process = cls._process.pid) + cls._app.connect_(process=cls._process.pid) # set truetype font (Lucida Console, hopefully) cls._app.window_().TypeKeys("% {UP}{ENTER}^L{HOME}L{ENTER}", with_spaces=True) @classmethod def tearDownClass(cls): - del cls.pywikibot - cls._process.kill() + del cls.pywikibot + cls._process.kill() def getstdouterr(self): - # select all and copy to clipboard - self._app.window_().SetFocus() - self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{DOWN}{ENTER}{ENTER}', with_spaces=True) - return self.getclip() + # select all and copy to clipboard + self._app.window_().SetFocus() + self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{DOWN}{ENTER}{ENTER}', with_spaces=True) + return self.getclip() - def setclip(self,text): - win32clipboard.OpenClipboard(); - win32clipboard.SetClipboardData(win32clipboard.CF_UNICODETEXT, unicode(text)); + def setclip(self, text): + win32clipboard.OpenClipboard() + win32clipboard.SetClipboardData(win32clipboard.CF_UNICODETEXT, unicode(text)) win32clipboard.CloseClipboard() def getclip(self): - win32clipboard.OpenClipboard(); + win32clipboard.OpenClipboard() data = win32clipboard.GetClipboardData(win32clipboard.CF_UNICODETEXT) win32clipboard.CloseClipboard() data = data.split(u"\x00")[0] @@ -362,10 +373,10 @@ return data def sendstdin(self, text): - self.setclip(text.replace(u"\n", u"\r\n")) - self._app.window_().SetFocus() - self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{ENTER}', with_spaces=True) - self.setclip(u'') + self.setclip(text.replace(u"\n", u"\r\n")) + self._app.window_().SetFocus() + self._app.window_().TypeKeys('% {UP}{UP}{UP}{RIGHT}{DOWN}{DOWN}{ENTER}', with_spaces=True) + self.setclip(u'') def setUp(self): super(TestWindowsTerminalUnicode, self).setUp()

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

Pywikipedia-svn June 2013