jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/778676 )
Change subject: [IMPR] use pathlib to extract filename and file_package
......................................................................
[IMPR] use pathlib to extract filename and file_package
Change-Id: I0cd7a804c9bec8c3dabadb6c693b52dfdd502d76
---
M pwb.py
1 file changed, 9 insertions(+), 19 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pwb.py b/pwb.py
index 5fa8c9a..7022eb3 100755
--- a/pwb.py
+++ b/pwb.py
@@ -154,15 +154,6 @@
# end of snippet from coverage
-def abspath(path):
- """Convert path to absolute path, with uppercase drive letter on win32."""
- path = os.path.abspath(path)
- if path[0] != '/':
- # normalise Windows drive letter
- path = path[0].upper() + path[1:]
- return path
-
-
def handle_args(pwb_py, *args):
"""Handle args and get filename.
@@ -438,16 +429,15 @@
# This is a rough (and quick!) emulation of 'package name' detection.
# a much more detailed implementation is in coverage's find_module.
# https://bitbucket.org/ned/coveragepy/src/default/coverage/execfile.py
- cwd = abspath(os.getcwd())
- absolute_path = abspath(os.path.dirname(sys.argv[0]))
- if absolute_path == cwd:
- absolute_filename = abspath(filename)[:len(cwd)]
- if absolute_filename == cwd:
- relative_filename = os.path.relpath(filename)
- # remove the filename, and use '.' instead of path separator.
- file_package = os.path.dirname(
- relative_filename).replace(os.sep, '.')
- filename = os.path.join(os.curdir, relative_filename)
+ cwd = Path.cwd()
+ syspath = Path(sys.argv[0])
+ absolute_path = syspath.parent
+ file_path = Path(filename)
+ if absolute_path == cwd and cwd in file_path.parents:
+ relative_filename = file_path.relative_to(absolute_path)
+ # remove the filename, and use '.' instead of path separator.
+ file_package = str(relative_filename.parent).replace(os.sep, '.')
+ filename = os.path.join(os.curdir, str(relative_filename))
module = None
if file_package and file_package not in sys.modules:
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/778676
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I0cd7a804c9bec8c3dabadb6c693b52dfdd502d76
Gerrit-Change-Number: 778676
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
