jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/439502 )
Change subject: [fix] Fix joining paths
......................................................................
[fix] Fix joining paths
- also use os.sep for file path
- also fix the module name removing ".\"
Change-Id: I754c0316b7f064a3cdb3fe9232a72c541b77ab97
---
M generate_family_file.py
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Lokal Profil: Looks good to me, approved
jenkins-bot: Verified
diff --git a/generate_family_file.py b/generate_family_file.py
index a21a7d8..7009717 100755
--- a/generate_family_file.py
+++ b/generate_family_file.py
@@ -127,7 +127,8 @@
def writefile(self):
"""Write the family file."""
fn = os.path.join(os.path.dirname(os.path.realpath(__file__)),
- 'pywikibot/families/%s_family.py' % self.name)
+ 'pywikibot', 'families',
+ '{}_family.py'.format(self.name))
print("Writing %s... " % fn)
try:
open(fn)
@@ -198,9 +199,11 @@
if __name__ == "__main__":
if len(sys.argv) != 3:
- print("Usage: %s <url> <short name>" % sys.argv[0])
- print("Example: %s
https://www.mywiki.bogus/wiki/Main_Page mywiki"
- % sys.argv[0])
- print("This will create the file families/mywiki_family.py")
+ print("""
+Usage: {module} <url> <short name>
+Example: {module}
https://www.mywiki.bogus/wiki/Main_Page mywiki
+This will create the file families{sep}mywiki_family.py"""
+ .format(module=sys.argv[0].strip('.' + os.sep),
+ sep=os.sep))
FamilyFileGenerator(*sys.argv[1:]).run()
--
To view, visit
https://gerrit.wikimedia.org/r/439502
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I754c0316b7f064a3cdb3fe9232a72c541b77ab97
Gerrit-Change-Number: 439502
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Lokal Profil <lokal.profil(a)gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot