Merge pull request #55 from juliangilbey/fix-win-test

Only import Windows-specific modules when on Windows

.travis.yml

@@ -17,12 +17,20 @@ matrix:
     - python: "3.4"
     - python: "3.5"
     - python: "3.6"
-    # Obtain Python 3.7 from xenial as per https://github.com/travis-ci/travis-ci/issues/9815
     - python: "3.7"
-      dist: xenial
+    - python: "3.8"
+    - python: "3.9"
+    - python: "nightly"  # 3.10
+      before_script:
+        - export TOXENV=py310
+    - python: "2.7"
+      arch: ppc64le
+    - python: "3.6"
+      arch: ppc64le
+        
 install:
-  - pip install tox
+  - python -m pip install tox
 before_script:
   - export TOXENV=$(echo py$TRAVIS_PYTHON_VERSION | tr -d .)
 script:
-  - tox
+  - python -m tox

README.rst

@@ -24,7 +24,7 @@ Installation
 
 You can download it with pip::
 
-    pip install Send2Trash
+    python -m pip install -U send2trash
 
 or you can download the source from http://github.com/arsenetar/send2trash and install it with::
 

send2trash/plat_other.py

@@ -110,11 +110,10 @@ def trash_move(src, dst, topdir=None):
 
     check_create(filespath)
     check_create(infopath)
-
+    
+    with open(op.join(infopath, destname + INFO_SUFFIX), "w") as f:
+        f.write(info_for(src, topdir))
     os.rename(src, op.join(filespath, destname))
-    f = open(op.join(infopath, destname + INFO_SUFFIX), "w")
-    f.write(info_for(src, topdir))
-    f.close()
 
 
 def find_mount_point(path):

setup.py

@@ -14,12 +14,13 @@ CLASSIFIERS = [
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
     "Topic :: Desktop Environment :: File Managers",
 ]
 
-LONG_DESCRIPTION = (
-    open("README.rst", "rt").read() + "\n\n" + open("CHANGES.rst", "rt").read()
-)
+with open("README.rst", "rt") as f1, open("CHANGES.rst", "rt") as f2:
+    LONG_DESCRIPTION = f1.read() + "\n\n" + f2.read()
 
 setup(
     name="Send2Trash",
@@ -36,4 +37,5 @@ setup(
     classifiers=CLASSIFIERS,
     extras_require={"win32": ["pywin32"]},
     project_urls={"Bug Reports": "https://github.com/arsenetar/send2trash/issues"},
+    entry_points={"console_scripts": ["send2trash=send2trash.__main__:main"]},
 )

tests/test_plat_win.py

@@ -9,8 +9,9 @@ from tempfile import gettempdir
 from send2trash import send2trash as s2t
 
 # import the two versions as well as the "automatic" version
-from send2trash.plat_win_modern import send2trash as s2t_modern
-from send2trash.plat_win_legacy import send2trash as s2t_legacy
+if sys.platform == "win32":
+    from send2trash.plat_win_modern import send2trash as s2t_modern
+    from send2trash.plat_win_legacy import send2trash as s2t_legacy
 
 
 @unittest.skipIf(sys.platform != "win32", "Windows only")

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36,py3-win
+envlist = py{27,34,35,36,37,38,39,310,3-win}
 skip_missing_interpreters = True
 
 [testenv]