Run of fresh-snapshots for straight.plugin

Try this locally (using silver-platter):

debian-svp new-upstream --snapshot straight.plugin 

Merge these changes:

git pull https://janitor.debian.net/git/straight.plugin fresh-snapshots/main

Summary

Merged new upstream version: 1.4.1+git20170717.aaaf68d (was: 1.4.1).

Diff

diff --git a/debian/changelog b/debian/changelog
index 370c6b1..bb56029 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+straight.plugin (1.4.1+git20170717.aaaf68d-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 28 Jan 2020 11:27:45 +0000
+
 straight.plugin (1.4.1-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/straight/plugin/loaders.py b/straight/plugin/loaders.py
index fff95c2..8d628c2 100644
--- a/straight/plugin/loaders.py
+++ b/straight/plugin/loaders.py
@@ -59,10 +59,7 @@ class ModuleLoader(Loader):
 
     def _isPackage(self, path):
         pkg_init = os.path.join(path, '__init__.py')
-        if os.path.exists(pkg_init):
-            return True
-
-        return False
+        return os.path.exists(pkg_init)
 
     def _findPluginFilePaths(self, namespace):
         already_seen = set()
diff --git a/tests.py b/tests.py
index 246bb98..56b104f 100755
--- a/tests.py
+++ b/tests.py
@@ -5,7 +5,10 @@ import os
 import unittest
 from types import ModuleType
 
-import mock
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
 from straight.plugin import loaders, manager
 
diff --git a/tox.ini b/tox.ini
index 36b1c97..ec65e08 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
-envlist = py27,py33,py34,py35
+envlist = py27,py33,py34,py35,py36
 
 [default]
-deps =
+deps = mock
 
 [testenv]
 setenv =

Full worker log Full build log