Skip to content

Commit cba4527

Browse files
WolfgangFahlWolfgangFahl
committed
fixes #87 
1 parent 98dffcf commit cba4527

32 files changed

Lines changed: 98 additions & 83 deletions

‎setup.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ! important
22
# see https://stackoverflow.com/a/27868004/1497139
33
from setuptools import setup
4-
from wikibot.version import Version
4+
from wikibot3rd.version import Version
55
# read the contents of your README file
66
from os import path
77
this_directory = path.abspath(path.dirname(__file__))
@@ -12,7 +12,7 @@
1212
name=Version.name,
1313
version=Version.version,
1414

15-
packages=['wikibot',],
15+
packages=['wikibot3rd',],
1616
classifiers=[
1717
'Programming Language :: Python',
1818
'Programming Language :: Python :: 3.7',
@@ -25,22 +25,22 @@
2525
install_requires=[
2626
'gitpython',
2727
'jinja2',
28-
'pywikibot~=7.3',
29-
'pycryptodome~=3.15.0',
30-
'mwclient~=0.10.1',
31-
'mwparserfromhell~=0.6.4',
32-
'wikitextparser~=0.47.5'
28+
'pywikibot>=7.3',
29+
'pycryptodome>=3.15.0',
30+
'mwclient>=0.10.1',
31+
'mwparserfromhell>=0.6.4',
32+
'wikitextparser>=0.47.5'
3333
],
3434
entry_points={
3535
'console_scripts': [
36-
'wikibackup = wikibot.wikipush:mainBackup',
37-
'wikiedit = wikibot.wikipush:mainEdit',
38-
'wikinuke = wikibot.wikipush:mainNuke',
39-
'wikipush = wikibot.wikipush:mainPush',
40-
'wikiquery = wikibot.wikipush:mainQuery',
41-
'wikiupload = wikibot.wikipush:mainUpload',
42-
'wikirestore = wikibot.wikipush:mainRestore',
43-
'wikiuser = wikibot.wikiuser:main',
36+
'wikibackup = wikibot3rd.wikipush:mainBackup',
37+
'wikiedit = wikibot3rd.wikipush:mainEdit',
38+
'wikinuke = wikibot3rd.wikipush:mainNuke',
39+
'wikipush = wikibot3rd.wikipush:mainPush',
40+
'wikiquery = wikibot3rd.wikipush:mainQuery',
41+
'wikiupload = wikibot3rd.wikipush:mainUpload',
42+
'wikirestore = wikibot3rd.wikipush:mainRestore',
43+
'wikiuser = wikibot3rd.wikiuser:main',
4444
],
4545
},
4646
author='Wolfgang Fahl',

‎tests/basetest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import getpass
1010
import warnings
1111

12-
from wikibot.wikiuser import WikiUser
12+
from wikibot3rd.wikiuser import WikiUser
1313

1414

1515
class Profiler:

‎tests/test_MediaWikiTable.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'''
66
from datetime import datetime,date
77
import unittest
8-
from wikibot.mwTable import MediaWikiTable
8+
from wikibot3rd.mwTable import MediaWikiTable
99
from tests.basetest import BaseTest
1010

1111
class Test_MediaWikiTable(BaseTest):

‎tests/test_PageHistory.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from tests.basetest import BaseTest
2-
from wikibot.pagehistory import PageHistory
2+
from wikibot3rd.pagehistory import PageHistory
33

44

55
class TestPageHistory(BaseTest):

‎tests/test_SMWApi.py‎

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
'''
66
import unittest
77
from unittest.mock import patch
8-
from wikibot.smw import SMW, SMWBot, SMWClient, QueryResultSizeExceedException, SplitClause
9-
from wikibot.wikibot import WikiBot
10-
from wikibot.wikiclient import WikiClient
8+
from wikibot3rd.smw import SMW, SMWBot, SMWClient, QueryResultSizeExceedException, SplitClause
9+
from wikibot3rd.wikibot import WikiBot
10+
from wikibot3rd.wikiclient import WikiClient
1111
from tests.test_wikibot import TestWikiBot
1212
from tests.test_WikiUser import TestWikiUser
1313
from datetime import datetime
@@ -329,8 +329,8 @@ def _askForAllResults_mock_sideEffect(query,limit):
329329
if query == expectedQuery:
330330
return [RESULT_N(i)]
331331

332-
with patch("wikibot.smw.SMWClient.askForAllResults") as askForAllResults_mock, \
333-
patch("wikibot.smw.SMWClient.getBoundariesOfQuery") as getBoundariesOfQuery:
332+
with patch("wikibot3rd.smw.SMWClient.askForAllResults") as askForAllResults_mock, \
333+
patch("wikibot3rd.smw.SMWClient.getBoundariesOfQuery") as getBoundariesOfQuery:
334334
getBoundariesOfQuery.return_value = (datetime.strptime("01/01/2020 00:00:00", '%d/%m/%Y %H:%M:%S'),
335335
datetime.strptime("11/01/2020 00:00:00", '%d/%m/%Y %H:%M:%S'))
336336
askForAllResults_mock.side_effect = _askForAllResults_mock_sideEffect
@@ -408,8 +408,8 @@ def askForAllResults_mock_side_effect(query, limit=None, kwargs={}):
408408
for smw in self.getSMWs():
409409
if isinstance(smw, SMWClient):
410410
# Test default case
411-
with patch("wikibot.smw.SMWClient.askForAllResults") as askForAllResults_mock, \
412-
patch("wikibot.smw.SMWClient.askPartitionQuery") as askPartitionQuery_mock:
411+
with patch("wikibot3rd.smw.SMWClient.askForAllResults") as askForAllResults_mock, \
412+
patch("wikibot3rd.smw.SMWClient.askPartitionQuery") as askPartitionQuery_mock:
413413
askForAllResults_mock.return_value = [RESULT]
414414
askPartitionQuery_mock.return_value = None
415415
result = smw.ask(QUERY)
@@ -418,8 +418,8 @@ def askForAllResults_mock_side_effect(query, limit=None, kwargs={}):
418418
self.assertEqual(askPartitionQuery_mock.call_count, 0)
419419
# Test if query division is used if 'queryDivision' attribute is set above 1
420420
smw.queryDivision = 10
421-
with patch("wikibot.smw.SMWClient.askForAllResults") as askForAllResults_mock, \
422-
patch("wikibot.smw.SMWClient.askPartitionQuery") as askPartitionQuery_mock:
421+
with patch("wikibot3rd.smw.SMWClient.askForAllResults") as askForAllResults_mock, \
422+
patch("wikibot3rd.smw.SMWClient.askPartitionQuery") as askPartitionQuery_mock:
423423
askForAllResults_mock.return_value = None
424424
askPartitionQuery_mock.return_value = [RESULT]
425425
result = smw.ask(QUERY)
@@ -535,6 +535,20 @@ def testIssue82(self):
535535
result = self.getAskResult(smw, ask, limit=5)
536536
self.assertTrue(len(result) == 5, name + smw.site.host+smw.site.path)
537537

538+
def testIssue86(self):
539+
"""
540+
test allowing count queries
541+
"""
542+
smw=self.getSMWs("smwcopy")[1]
543+
askQuery="""{{#ask: [[Modification date::+]]
544+
|format=count
545+
}}"""
546+
result=smw.query(askQuery)
547+
debug=self.debug
548+
debug=True
549+
if debug:
550+
print(result)
551+
# @FIXME - fix when https://github.com/SemanticMediaWiki/SemanticMediaWiki/issues/4857 is fixed
538552

539553
if __name__ == "__main__":
540554
#import sys;sys.argv = ['', 'Test.testSMWApi']

‎tests/test_Selector.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
'''
55
import sys
66
import unittest
7-
from wikibot.selector import Selector
7+
from wikibot3rd.selector import Selector
88
import getpass
99
import logging
1010
from tests.basetest import BaseTest

‎tests/test_WikiPush.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import warnings
1010
from contextlib import redirect_stdout
1111

12-
import wikibot
13-
from wikibot.wikipush import WikiPush
12+
import wikibot3rd
13+
from wikibot3rd.wikipush import WikiPush
1414
from tests.basetest import BaseTest
1515

1616

@@ -175,7 +175,7 @@ def testWikiBackupCommandLine(self):
175175
test starting backup from the command line
176176
'''
177177
argv=["-s","smwcopy","-q","[[modification date::+]]"]
178-
wikibot.wikipush.mainBackup(argv)
178+
wikibot3rd.wikipush.mainBackup(argv)
179179

180180

181181
def testWikiPush(self):
@@ -228,20 +228,20 @@ def testWarnings(self):
228228
return
229229
# https://stackoverflow.com/a/5222474/1497139
230230
argv=["-l","-s","swa","-t","test","-q","[[modification date::>2020-11-29]]","-wi","-f","-i"]
231-
wikibot.wikipush.main(argv)
231+
wikibot3rd.wikipush.main(argv)
232232

233233
def testEdit(self):
234234
return
235235
# this actually edits data ... don't activate if you don't really want to do this
236236
argv=["-t","orcopy","-d","-q","[[isA::Event]]","--search","\\[Category:","--replace","[has category::","-f","--progress"]
237-
wikibot.wikipush.mainEdit(argv)
237+
wikibot3rd.wikipush.mainEdit(argv)
238238
return
239239

240240
def testRestore(self):
241241
return
242242
# this actually edits data ... don't activate if you don't really want to do this
243243
argv=["-s","smwcopy","-t","smwcopy","-q","[[modification date::+]]"]
244-
wikibot.wikipush.mainRestore(argv)
244+
wikibot3rd.wikipush.mainRestore(argv)
245245
return
246246

247247
def testHandleWarningIssue70(self):
@@ -283,7 +283,7 @@ def testIssue75(self):
283283
argv = ["-s", "orfixed", "-t", "test", "-p", "Form:Rating"]
284284
f = io.StringIO()
285285
with redirect_stdout(f):
286-
wikibot.wikipush.mainPush(argv=argv)
286+
wikibot3rd.wikipush.mainPush(argv=argv)
287287
out = f.getvalue()
288288
if self.debug:
289289
print(out)

‎tests/test_WikiUser.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
@author: wf
55
'''
66
import unittest
7-
from wikibot.wikiuser import WikiUser
8-
import wikibot
7+
from wikibot3rd.wikiuser import WikiUser
8+
import wikibot3rd
99
import os
1010
import tempfile
1111
from tests.basetest import BaseTest
@@ -45,7 +45,7 @@ def getSMW_WikiUser(wikiId="smw"):
4545
if wikiId=="smwcopy":
4646
wikiDict={"wikiId": wikiId,"email":"webmaster@bitplan.com","url":"https://smw.bitplan.com","scriptPath":"","version":"MediaWiki 1.35.5"}
4747
elif wikiId=="smw":
48-
wikiDict={"wikiId": wikiId,"email":"webmaster@semantic-mediawiki.org","url":"https://www.semantic-mediawiki.org","scriptPath":"/w","version":"MediaWiki 1.31.7"}
48+
wikiDict={"wikiId": wikiId,"email":"webmaster@semantic-mediawiki.org","url":"https://www.semantic-mediawiki.org","scriptPath":"/w","version":"MediaWiki 1.31.16"}
4949
elif wikiId=="or":
5050
wikiDict={"wikiId": wikiId,"email":"webmaster@openresearch.org","url":"https://www.openresearch.org","scriptPath":"/mediawiki/","version":"MediaWiki 1.31.1"}
5151
raise Exception("don")
@@ -72,7 +72,7 @@ def testCommandLine(self):
7272
try:
7373
if (fd):
7474
args=["--url","http://wiki.doe.com","-u","john","-e","john@doe.com","-w","doe","-s","","-v","MediaWiki 1.35.0","-p",password,"-f",path,'-y']
75-
wikibot.wikiuser.main(args)
75+
wikibot3rd.wikiuser.main(args)
7676
finally:
7777
if self.debug:
7878
print(open(path, 'r').read())

‎tests/test_duckinterface.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
@author: wf
55
'''
66
import unittest
7-
from wikibot.wiki import Wiki
8-
from wikibot.wikibot import WikiBot
9-
from wikibot.wikiclient import WikiClient
7+
from wikibot3rd.wiki import Wiki
8+
from wikibot3rd.wikibot import WikiBot
9+
from wikibot3rd.wikiclient import WikiClient
1010
from tests.test_WikiUser import TestWikiUser
1111
from tests.basetest import BaseTest
1212

‎tests/test_lambda.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
from lodstorage.query import Query
99

10-
from wikibot.lambda_action import LambdaAction, Code
11-
from wikibot.wikiuser import WikiUser
12-
from wikibot.wikiclient import WikiClient
13-
from wikibot.smw import SMWClient
14-
from wikibot.wikiaction import WikiAction
10+
from wikibot3rd.lambda_action import LambdaAction, Code
11+
from wikibot3rd.wikiuser import WikiUser
12+
from wikibot3rd.wikiclient import WikiClient
13+
from wikibot3rd.smw import SMWClient
14+
from wikibot3rd.wikiaction import WikiAction
1515
from tests.basetest import BaseTest
1616

1717
class TestLambda(BaseTest):

0 commit comments

Comments
 (0)