Merge pull request #2528 from johnfraney/fix-failing-ci

Remove Python 3.4

.travis.yml

@@ -5,7 +5,6 @@ env:
   - TOX_ENV=docs
   - TOX_ENV=flake8
   - TOX_ENV=py27
-  - TOX_ENV=py34
   - TOX_ENV=py35
 matrix:
   include:

docs/install.rst

@@ -1,7 +1,7 @@
 Installing Pelican
 ##################
 
-Pelican currently runs best on Python 2.7.x and 3.4+; earlier versions of
+Pelican currently runs best on Python 2.7.x and 3.5+; earlier versions of
 Python are not supported.
 
 You can install Pelican via several different methods. The simplest is via

pelican/readers.py

@@ -367,7 +367,7 @@ class HTMLReader(BaseReader):
     class _HTMLParser(HTMLParser):
         def __init__(self, settings, filename):
             try:
-                # Python 3.4+
+                # Python 3.5+
                 HTMLParser.__init__(self, convert_charrefs=False)
             except TypeError:
                 HTMLParser.__init__(self)

pelican/tools/pelican_import.py

@@ -22,7 +22,7 @@ from pelican.settings import read_settings
 from pelican.utils import SafeDatetime, slugify
 
 try:
-    from html import unescape  # py3.4+
+    from html import unescape  # py3.5+
 except ImportError:
     from six.moves.html_parser import HTMLParser
     unescape = HTMLParser().unescape

pelican/tools/pelican_themes.py

@@ -81,9 +81,9 @@ def main():
     to_sym = args.to_symlink or args.clean
 
     if args.action:
-        if args.action is 'list':
+        if args.action == 'list':
             list_themes(args.verbose)
-        elif args.action is 'path':
+        elif args.action == 'path':
             print(_THEMES_PATH)
     elif to_install or args.to_remove or to_sym:
         if args.to_remove:

pelican/utils.py

@@ -787,8 +787,11 @@ def folder_watcher(path, extensions, ignores=[]):
             dirs[:] = [x for x in dirs if not x.startswith(os.curdir)]
 
             for f in files:
-                if f.endswith(tuple(extensions)) and \
-                   not any(fnmatch.fnmatch(f, ignore) for ignore in ignores):
+                valid_extension = f.endswith(tuple(extensions))
+                file_ignored = any(
+                    fnmatch.fnmatch(f, ignore) for ignore in ignores
+                )
+                if valid_extension and not file_ignored:
                     try:
                         yield os.stat(os.path.join(root, f)).st_mtime
                     except OSError as e:

setup.py

@@ -62,7 +62,6 @@ setup(
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',

tox.ini

@@ -1,10 +1,9 @@
 [tox]
-envlist = py{27,34,35,36,37},docs,flake8
+envlist = py{27,35,36,37},docs,flake8
 
 [testenv]
 basepython =
     py27: python2.7
-    py34: python3.4
     py35: python3.5
     py36: python3.6
     py37: python3.7