Hello community, here is the log from the commit of package python-whichcraft for openSUSE:Leap:15.2 checked in at 2020-03-02 13:24:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/python-whichcraft (Old) and /work/SRC/openSUSE:Leap:15.2/.python-whichcraft.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-whichcraft" Mon Mar 2 13:24:56 2020 rev:15 rq:777281 version:0.6.1 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/python-whichcraft/python-whichcraft.changes 2020-01-15 15:54:12.971624482 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.python-whichcraft.new.26092/python-whichcraft.changes 2020-03-02 13:24:57.186588729 +0100 @@ -1,0 +2,24 @@ +Mon Sep 9 15:17:03 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 0.6.1: + * fix versioning issue + +------------------------------------------------------------------- +Mon Jul 22 11:40:28 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 0.6.0: + * no upstream changelog + +------------------------------------------------------------------- +Fri Mar 29 11:29:07 UTC 2019 - [email protected] + +- version update to 0.5.2 + * Use black for code formatting + * Add 3.7 support thanks to @rooterkyberian + +------------------------------------------------------------------- +Tue Dec 4 12:56:02 UTC 2018 - Matej Cepl <[email protected]> + +- Remove superfluous devel dependency for noarch package + +------------------------------------------------------------------- Old: ---- whichcraft-0.4.1.tar.gz New: ---- whichcraft-0.6.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-whichcraft.spec ++++++ --- /var/tmp/diff_new_pack.oJJ4g9/_old 2020-03-02 13:24:57.950590249 +0100 +++ /var/tmp/diff_new_pack.oJJ4g9/_new 2020-03-02 13:24:57.954590257 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-whichcraft # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,29 +12,26 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%bcond_without test Name: python-whichcraft -Version: 0.4.1 +Version: 0.6.1 Release: 0 Summary: Cross-python shutil.which functionality License: BSD-3-Clause Group: Development/Languages/Python -Url: https://github.com/pydanny/whichcraft +URL: https://github.com/pydanny/whichcraft Source: https://files.pythonhosted.org/packages/source/w/whichcraft/whichcraft-%{version}.tar.gz -BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros -%if %{with test} -BuildRequires: %{python_module pytest} -%endif BuildArch: noarch - +# SECTION test requirements +BuildRequires: %{python_module pytest} +# /SECTION %python_subpackages %description @@ -53,14 +50,12 @@ %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} -%if %{with test} %check -%python_exec test_whichcraft.py -%endif +%pytest %files %{python_files} -%defattr(-,root,root,-) -%doc AUTHORS.rst HISTORY.rst LICENSE README.rst +%license LICENSE +%doc AUTHORS.rst HISTORY.rst README.rst %{python_sitelib}/* %changelog ++++++ whichcraft-0.4.1.tar.gz -> whichcraft-0.6.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/AUTHORS.rst new/whichcraft-0.6.1/AUTHORS.rst --- old/whichcraft-0.4.1/AUTHORS.rst 2017-04-25 22:49:34.000000000 +0200 +++ new/whichcraft-0.6.1/AUTHORS.rst 2019-09-06 21:16:00.000000000 +0200 @@ -12,3 +12,5 @@ * Edward Betts (@EdwardBetts) * Nick Coghlan (@ncoghlan) +* rooterkyberian (@rooterkyberian) +* OhenebaAduhene (@OhenebaAduhene) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/CONTRIBUTING.rst new/whichcraft-0.6.1/CONTRIBUTING.rst --- old/whichcraft-0.4.1/CONTRIBUTING.rst 2017-04-25 22:49:34.000000000 +0200 +++ new/whichcraft-0.6.1/CONTRIBUTING.rst 2018-10-10 06:47:41.000000000 +0200 @@ -74,13 +74,16 @@ Now you can make your changes locally. -5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox:: +5. Run `black` (python 3.6 or highter) when making any changes to enforce code style:: - $ flake8 whichcraft.py test_whichcraft.py - $ py.test + $ black . + +5. When you're done making changes, check the tests, including testing other Python versions with tox:: + + $ pytest $ tox - To get flake8 and tox, just pip install them into your virtualenv. + To get pytest and tox, just pip install them into your virtualenv. 6. Commit your changes and push your branch to GitHub:: @@ -99,13 +102,6 @@ 2. If the pull request adds functionality, the docs should be updated. Put your new functionality into a function with a docstring, and add the feature to the list in README.rst. -3. The pull request should work for Python 2.6, 2.7, 3.3, and 3.4, and for PyPy. Check +3. The pull request should work for Python 2.7, 3.3, 3.4, 3.5, 3.6, 3.7 and for PyPy. Check https://travis-ci.org/pydanny/whichcraft/pull_requests and make sure that the tests pass for all supported Python versions. - -Tips ----- - -To run a subset of tests:: - - TODO \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/HISTORY.rst new/whichcraft-0.6.1/HISTORY.rst --- old/whichcraft-0.4.1/HISTORY.rst 2017-04-25 22:55:31.000000000 +0200 +++ new/whichcraft-0.6.1/HISTORY.rst 2019-09-06 21:16:55.000000000 +0200 @@ -1,12 +1,50 @@ History ========= +0.6.1 (2019-09-06) +--------------------- + +* Fix versioning issue + +0.6.0 (2019-07-12) +--------------------- + +* Remove lingering unicode issues +* Add BriteCore as a sponsor + +0.5.3 (2018-10-10) +--------------------- + +* Add BriteCore as a sponsor + +0.5.2 (2018-10-09) +--------------------- + +* Remove any mention of 3.2 and 3.3 + +0.5.1 (2018-10-09) +--------------------- + +* Fix setup.py so it works with older Python + +0.5.0 (2018-10-09) +--------------------- + +* Add 3.7 support thanks to @rooterkyberian +* Remove any mention of 2.6 + +0.4.2 (2018-04-16) +--------------------- + +* Use black for code formatting +* Move status to production/stable +* Drop Python 2.6 and 3.3 support + 0.4.1 (2017-04-25) --------------------- * Added tests to support Python 3.6 - 0.3.1 (2016-05-10) --------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/PKG-INFO new/whichcraft-0.6.1/PKG-INFO --- old/whichcraft-0.4.1/PKG-INFO 2017-04-25 23:06:48.000000000 +0200 +++ new/whichcraft-0.6.1/PKG-INFO 2019-09-06 21:19:41.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: whichcraft -Version: 0.4.1 +Version: 0.6.1 Summary: This package provides cross-platform cross-python shutil.which functionality. Home-page: https://github.com/pydanny/whichcraft Author: Daniel Roy Greenfeld @@ -16,12 +16,16 @@ .. image:: https://travis-ci.org/pydanny/whichcraft.svg?branch=master :target: https://travis-ci.org/pydanny/whichcraft - .. image:: http://codecov.io/github/pydanny/whichcraft/coverage.svg?branch=master + .. image:: https://codecov.io/gh/pydanny/whichcraft/branch/master/graph/badge.svg :target: http://codecov.io/github/pydanny/whichcraft?branch=master .. image:: https://ci.appveyor.com/api/projects/status/v9coijayykhkeu4d?svg=true :target: https://ci.appveyor.com/project/pydanny/whichcraft + .. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/ambv/black + :alt: Code style: black + :: That code in my care @@ -34,7 +38,7 @@ Usage ===== - On Linux, Mac, Windows for Python 2.6, 2.7, or any of the 3s: + On Linux, Mac, Windows for Python 2.7 or any of the maintained 3s: .. code-block:: python @@ -57,18 +61,72 @@ based on Python 3 code that I extracted from source. I originally did this for Cookiecutter_ but pulled it out in order to reduce line count for that project. + Edgecase: Date function works perfectly on mac os and linux system, hence returns string. + But is an in-built function in windows hence returns none as value when called in + windows. + .. _Cookiecutter: https://github.com/audreyr/cookiecutter + Sponsor + ======= + + This work is sponsored by BriteCore, which does awesome things with Python, Django, JavaScript, and AWS. `Apply for a job if you're interested!`_ + + .. image:: https://avatars1.githubusercontent.com/u/967173?s=200&v=4 + :target: http://engineering-application.britecore.com/ + :alt: Code style: black + + .. _BriteCore: https://www.britecore.com/ + .. _`Apply for a job if you're interested!`: http://engineering-application.britecore.com/ + History ========= + 0.6.1 (2019-09-06) + --------------------- + + * Fix versioning issue + + 0.6.0 (2019-07-12) + --------------------- + + * Remove lingering unicode issues + * Add BriteCore as a sponsor + + 0.5.3 (2018-10-10) + --------------------- + + * Add BriteCore as a sponsor + + 0.5.2 (2018-10-09) + --------------------- + + * Remove any mention of 3.2 and 3.3 + + 0.5.1 (2018-10-09) + --------------------- + + * Fix setup.py so it works with older Python + + 0.5.0 (2018-10-09) + --------------------- + + * Add 3.7 support thanks to @rooterkyberian + * Remove any mention of 2.6 + + 0.4.2 (2018-04-16) + --------------------- + + * Use black for code formatting + * Move status to production/stable + * Drop Python 2.6 and 3.3 support + 0.4.1 (2017-04-25) --------------------- * Added tests to support Python 3.6 - 0.3.1 (2016-05-10) --------------------- @@ -101,15 +159,12 @@ Keywords: whichcraft Platform: UNKNOWN -Classifier: Development Status :: 3 - Alpha +Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: BSD License Classifier: Natural Language :: English Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.2 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 -Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/README.rst new/whichcraft-0.6.1/README.rst --- old/whichcraft-0.4.1/README.rst 2017-04-25 22:54:02.000000000 +0200 +++ new/whichcraft-0.6.1/README.rst 2019-09-06 21:19:36.000000000 +0200 @@ -8,12 +8,16 @@ .. image:: https://travis-ci.org/pydanny/whichcraft.svg?branch=master :target: https://travis-ci.org/pydanny/whichcraft -.. image:: http://codecov.io/github/pydanny/whichcraft/coverage.svg?branch=master +.. image:: https://codecov.io/gh/pydanny/whichcraft/branch/master/graph/badge.svg :target: http://codecov.io/github/pydanny/whichcraft?branch=master .. image:: https://ci.appveyor.com/api/projects/status/v9coijayykhkeu4d?svg=true :target: https://ci.appveyor.com/project/pydanny/whichcraft +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/ambv/black + :alt: Code style: black + :: That code in my care @@ -26,7 +30,7 @@ Usage ===== -On Linux, Mac, Windows for Python 2.6, 2.7, or any of the 3s: +On Linux, Mac, Windows for Python 2.7 or any of the maintained 3s: .. code-block:: python @@ -49,4 +53,20 @@ based on Python 3 code that I extracted from source. I originally did this for Cookiecutter_ but pulled it out in order to reduce line count for that project. +Edgecase: Date function works perfectly on mac os and linux system, hence returns string. +But is an in-built function in windows hence returns none as value when called in +windows. + .. _Cookiecutter: https://github.com/audreyr/cookiecutter + +Sponsor +======= + +This work is sponsored by BriteCore, which does awesome things with Python, Django, JavaScript, and AWS. `Apply for a job if you're interested!`_ + +.. image:: https://avatars1.githubusercontent.com/u/967173?s=200&v=4 + :target: http://engineering-application.britecore.com/ + :alt: Code style: black + +.. _BriteCore: https://www.britecore.com/ +.. _`Apply for a job if you're interested!`: http://engineering-application.britecore.com/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/setup.cfg new/whichcraft-0.6.1/setup.cfg --- old/whichcraft-0.4.1/setup.cfg 2017-04-25 23:06:48.000000000 +0200 +++ new/whichcraft-0.6.1/setup.cfg 2019-09-06 21:19:41.000000000 +0200 @@ -7,5 +7,4 @@ [egg_info] tag_build = tag_date = 0 -tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/setup.py new/whichcraft-0.6.1/setup.py --- old/whichcraft-0.4.1/setup.py 2017-04-25 22:55:58.000000000 +0200 +++ new/whichcraft-0.6.1/setup.py 2019-09-06 21:16:17.000000000 +0200 @@ -9,63 +9,67 @@ except ImportError: from distutils.core import setup -version = "0.4.1" +version = "0.6.1" -if sys.argv[-1] == 'publish': +if sys.argv[-1] == "publish": try: import wheel except ImportError: raise ImportError("Fix: pip install wheel") - os.system('python setup.py sdist bdist_wheel upload') - print("You probably want to also tag the version now:") - print(" git tag -a %s -m 'version %s'" % (version, version)) - print(" git push --tags") + try: + import twine + except ImportError: + raise ImportError("Fix: pip install twine") + + os.system("python setup.py sdist bdist_wheel") + os.system("twine upload dist/*") + print("You might want to tag a release now") sys.exit() -if sys.argv[-1] == 'tag': +if sys.argv[-1] == "tag": print("Tagging the version on github:") os.system("git tag -a %s -m 'version %s'" % (version, version)) os.system("git push --tags") sys.exit() -readme = open('README.rst').read() -history = open('HISTORY.rst').read().replace('.. :changelog:', '') +readme = open("README.rst").read() +history = open("HISTORY.rst").read().replace(".. :changelog:", "") + def get_requirements(filename): f = open(filename).read() reqs = [ - # loop through list of requirements - x.strip() for x in f.splitlines() - # filter out comments and empty lines - if not x.strip().startswith('#') - ] + # loop through list of requirements + x.strip() + for x in f.splitlines() + # filter out comments and empty lines + if not x.strip().startswith("#") + ] return reqs + setup( - name='whichcraft', + name="whichcraft", version=version, description="""This package provides cross-platform cross-python shutil.which functionality.""", - long_description=readme + '\n\n' + history, - author='Daniel Roy Greenfeld', - author_email='[email protected]', - url='https://github.com/pydanny/whichcraft', + long_description=readme + "\n\n" + history, + author="Daniel Roy Greenfeld", + author_email="[email protected]", + url="https://github.com/pydanny/whichcraft";, include_package_data=True, - py_modules=['whichcraft'], + py_modules=["whichcraft"], license="BSD", zip_safe=False, - keywords='whichcraft', + keywords="whichcraft", classifiers=[ - 'Development Status :: 3 - Alpha', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: BSD License', - 'Natural Language :: English', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.2', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', + "Development Status :: 5 - Production/Stable", + "Intended Audience :: Developers", + "License :: OSI Approved :: BSD License", + "Natural Language :: English", + "Programming Language :: Python :: 2", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", ], ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/test_whichcraft.py new/whichcraft-0.6.1/test_whichcraft.py --- old/whichcraft-0.4.1/test_whichcraft.py 2017-04-25 22:49:34.000000000 +0200 +++ new/whichcraft-0.6.1/test_whichcraft.py 2018-10-10 06:47:41.000000000 +0200 @@ -5,7 +5,7 @@ def test_existing_command(): - cmd = which('date') + cmd = which("date") assert cmd assert os.path.exists(cmd) assert os.access(cmd, os.F_OK | os.X_OK) @@ -13,8 +13,8 @@ def test_non_existing_command(): - assert which('stringthatisntashellcommand') is None + assert which("stringthatisntashellcommand") is None -if __name__ == '__main__': +if __name__ == "__main__": pytest.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/whichcraft.egg-info/PKG-INFO new/whichcraft-0.6.1/whichcraft.egg-info/PKG-INFO --- old/whichcraft-0.4.1/whichcraft.egg-info/PKG-INFO 2017-04-25 23:06:48.000000000 +0200 +++ new/whichcraft-0.6.1/whichcraft.egg-info/PKG-INFO 2019-09-06 21:19:40.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: whichcraft -Version: 0.4.1 +Version: 0.6.1 Summary: This package provides cross-platform cross-python shutil.which functionality. Home-page: https://github.com/pydanny/whichcraft Author: Daniel Roy Greenfeld @@ -16,12 +16,16 @@ .. image:: https://travis-ci.org/pydanny/whichcraft.svg?branch=master :target: https://travis-ci.org/pydanny/whichcraft - .. image:: http://codecov.io/github/pydanny/whichcraft/coverage.svg?branch=master + .. image:: https://codecov.io/gh/pydanny/whichcraft/branch/master/graph/badge.svg :target: http://codecov.io/github/pydanny/whichcraft?branch=master .. image:: https://ci.appveyor.com/api/projects/status/v9coijayykhkeu4d?svg=true :target: https://ci.appveyor.com/project/pydanny/whichcraft + .. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/ambv/black + :alt: Code style: black + :: That code in my care @@ -34,7 +38,7 @@ Usage ===== - On Linux, Mac, Windows for Python 2.6, 2.7, or any of the 3s: + On Linux, Mac, Windows for Python 2.7 or any of the maintained 3s: .. code-block:: python @@ -57,18 +61,72 @@ based on Python 3 code that I extracted from source. I originally did this for Cookiecutter_ but pulled it out in order to reduce line count for that project. + Edgecase: Date function works perfectly on mac os and linux system, hence returns string. + But is an in-built function in windows hence returns none as value when called in + windows. + .. _Cookiecutter: https://github.com/audreyr/cookiecutter + Sponsor + ======= + + This work is sponsored by BriteCore, which does awesome things with Python, Django, JavaScript, and AWS. `Apply for a job if you're interested!`_ + + .. image:: https://avatars1.githubusercontent.com/u/967173?s=200&v=4 + :target: http://engineering-application.britecore.com/ + :alt: Code style: black + + .. _BriteCore: https://www.britecore.com/ + .. _`Apply for a job if you're interested!`: http://engineering-application.britecore.com/ + History ========= + 0.6.1 (2019-09-06) + --------------------- + + * Fix versioning issue + + 0.6.0 (2019-07-12) + --------------------- + + * Remove lingering unicode issues + * Add BriteCore as a sponsor + + 0.5.3 (2018-10-10) + --------------------- + + * Add BriteCore as a sponsor + + 0.5.2 (2018-10-09) + --------------------- + + * Remove any mention of 3.2 and 3.3 + + 0.5.1 (2018-10-09) + --------------------- + + * Fix setup.py so it works with older Python + + 0.5.0 (2018-10-09) + --------------------- + + * Add 3.7 support thanks to @rooterkyberian + * Remove any mention of 2.6 + + 0.4.2 (2018-04-16) + --------------------- + + * Use black for code formatting + * Move status to production/stable + * Drop Python 2.6 and 3.3 support + 0.4.1 (2017-04-25) --------------------- * Added tests to support Python 3.6 - 0.3.1 (2016-05-10) --------------------- @@ -101,15 +159,12 @@ Keywords: whichcraft Platform: UNKNOWN -Classifier: Development Status :: 3 - Alpha +Classifier: Development Status :: 5 - Production/Stable Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: BSD License Classifier: Natural Language :: English Classifier: Programming Language :: Python :: 2 Classifier: Programming Language :: Python :: 2.7 Classifier: Programming Language :: Python :: 3 -Classifier: Programming Language :: Python :: 3.2 -Classifier: Programming Language :: Python :: 3.3 -Classifier: Programming Language :: Python :: 3.4 -Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/whichcraft-0.4.1/whichcraft.py new/whichcraft-0.6.1/whichcraft.py --- old/whichcraft-0.4.1/whichcraft.py 2017-04-25 22:55:54.000000000 +0200 +++ new/whichcraft-0.6.1/whichcraft.py 2019-09-06 21:16:59.000000000 +0200 @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- -__author__ = 'Daniel Roy Greenfeld' -__email__ = '[email protected]' -__version__ = '0.4.1' +__author__ = "Daniel Roy Greenfeld" +__email__ = "[email protected]" +__version__ = "0.6.1" import os import sys -try: # Forced testing +try: # Forced testing from shutil import which -except ImportError: # Forced testing +except ImportError: # Forced testing # Versions prior to Python 3.3 don't have shutil.which def which(cmd, mode=os.F_OK | os.X_OK, path=None): @@ -24,9 +24,9 @@ # Check that a given file can be accessed with the correct mode. # Additionally check that `file` is not a directory, as on Windows # directories pass the os.access check. + def _access_check(fn, mode): - return (os.path.exists(fn) and os.access(fn, mode) and - not os.path.isdir(fn)) + return os.path.exists(fn) and os.access(fn, mode) and not os.path.isdir(fn) # If we're given a path with a directory part, look it up directly # rather than referring to PATH directories. This includes checking @@ -34,12 +34,14 @@ if os.path.dirname(cmd): if _access_check(cmd, mode): return cmd + return None if path is None: path = os.environ.get("PATH", os.defpath) if not path: return None + path = path.split(os.pathsep) if sys.platform == "win32": @@ -71,4 +73,5 @@ name = os.path.join(dir, thefile) if _access_check(name, mode): return name + return None
