Merge pull request #250 from hugovk/rm-eol

Author: pradyunsg

Makefile

@@ -15,7 +15,7 @@ clean-pyc:
 	find . -name '*~' -exec rm -f {} +
 
 install:
-	python setup.py install
+	python3 setup.py install
 
 docs:
 	$(MAKE) -C docs html

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # Python LiveReload documentation build configuration file, created by
 # sphinx-quickstart on Sat May  5 18:36:44 2012.
@@ -42,8 +41,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Python LiveReload'
-copyright = u'2012, <a href="http://lepture.com">Hsiaoming Yang</a>'
+project = 'Python LiveReload'
+copyright = '2012, <a href="http://lepture.com">Hsiaoming Yang</a>'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -192,8 +191,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'PythonLiveReload.tex', u'Python LiveReload Documentation',
-   u'Hsiaoming Yang', 'manual'),
+  ('index', 'PythonLiveReload.tex', 'Python LiveReload Documentation',
+   'Hsiaoming Yang', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -222,8 +221,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'livereload', u'Python LiveReload Documentation',
-     [u'Hsiaoming Yang'], 1)
+    ('index', 'livereload', 'Python LiveReload Documentation',
+     ['Hsiaoming Yang'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -236,8 +235,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'PythonLiveReload', u'Python LiveReload Documentation',
-   u'Hsiaoming Yang', 'PythonLiveReload', 'One line description of project.',
+  ('index', 'PythonLiveReload', 'Python LiveReload Documentation',
+   'Hsiaoming Yang', 'PythonLiveReload', 'One line description of project.',
    'Miscellaneous'),
 ]
 

livereload/handlers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     livereload.handlers
     ~~~~~~~~~~~~~~~~~~~

livereload/server.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     livereload.server
     ~~~~~~~~~~~~~~~~~
@@ -27,11 +26,10 @@
 from .handlers import LiveReloadHandler, LiveReloadJSHandler
 from .handlers import ForceReloadHandler, StaticFileHandler
 from .watcher import get_watcher_class
-from six import string_types, PY3
 
 import sys
 
-if sys.version_info >= (3, 7) or sys.version_info.major == 2:
+if sys.version_info >= (3, 7):
     import errno
 else:
     from os import errno
@@ -94,8 +92,7 @@ def run_shell():
             logger.error(stderr)
             return stderr
         #: stdout is bytes, decode for python3
-        if PY3:
-            stdout = stdout.decode()
+        stdout = stdout.decode()
         with open(output, mode) as f:
             f.write(stdout)
 
@@ -104,7 +101,7 @@ def run_shell():
 
 class LiveScriptInjector(web.OutputTransform):
     def __init__(self, request):
-        super(LiveScriptInjector, self).__init__(request)
+        super().__init__(request)
 
     def transform_first_chunk(self, status_code, headers, chunk, finishing):
         if HEAD_END in chunk:
@@ -143,7 +140,7 @@ def start_response(status, response_headers, exc_info=None):
         status_code, reason = data["status"].split(' ', 1)
         status_code = int(status_code)
         headers = data["headers"]
-        header_set = set(k.lower() for (k, v) in headers)
+        header_set = {k.lower() for (k, v) in headers}
         body = escape.utf8(body)
 
         if HEAD_END in body:
@@ -174,7 +171,7 @@ def start_response(status, response_headers, exc_info=None):
         self._log(status_code, request)
 
 
-class Server(object):
+class Server:
     """Livereload server interface.
 
     Initialize a server and watch file changes::
@@ -239,10 +236,10 @@ def alert():
         :param ignore: A function return True to ignore a certain pattern of
                        filepath.
         """
-        if isinstance(func, string_types):
+        if isinstance(func, str):
             cmd = func
             func = shell(func)
-            func.name = "shell: {}".format(cmd)
+            func.name = f"shell: {cmd}"
 
         self.watcher.watch(filepath, func, delay, ignore=ignore)
 
@@ -332,7 +329,7 @@ def serve(self, port=5500, liveport=None, host=None, root=None, debug=None,
             self.root = root
 
         self._setup_logging()
-        logger.info('Serving on http://%s:%s' % (host, port))
+        logger.info(f'Serving on http://{host}:{port}')
 
         self.default_filename = default_filename
 
@@ -346,7 +343,7 @@ def serve(self, port=5500, liveport=None, host=None, root=None, debug=None,
 
             def opener():
                 time.sleep(open_url_delay)
-                webbrowser.open('http://%s:%s' % (host, port))
+                webbrowser.open(f'http://{host}:{port}')
             threading.Thread(target=opener).start()
 
         try:

livereload/watcher.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     livereload.watcher
     ~~~~~~~~~~~~~~~~~~
@@ -13,12 +12,7 @@
 import logging
 import os
 import time
-import sys
-
-if sys.version_info.major < 3:
-    import inspect
-else:
-    from inspect import signature
+from inspect import signature
 
 try:
     import pyinotify
@@ -28,7 +22,7 @@
 logger = logging.getLogger('livereload')
 
 
-class Watcher(object):
+class Watcher:
     """A file watcher registry."""
     def __init__(self):
         self._tasks = {}
@@ -108,12 +102,8 @@ def examine(self):
                     if not name:
                         name = getattr(func, '__name__', 'anonymous')
                     logger.info(
-                        "Running task: {} (delay: {})".format(name, delay))
-                    if sys.version_info.major < 3:
-                        sig_len = len(inspect.getargspec(func)[0])
-                    else:
-                        sig_len = len(signature(func).parameters)
-                    if sig_len > 0 and isinstance(changed, list):
+                        f"Running task: {name} (delay: {delay})")
+                    if len(signature(func).parameters) > 0 and isinstance(changed, list):
                         func(changed)
                     else:
                         func()
@@ -206,10 +196,7 @@ def is_folder_changed(self, path, ignore=None):
 
     def get_changed_glob_files(self, path, ignore=None):
         """Check if glob path has any changed filepaths."""
-        if sys.version_info[0] >=3 and sys.version_info[1] >=5:
-            files = glob.glob(path, recursive=True)
-        else:
-            files = glob.glob(path)
+        files = glob.glob(path, recursive=True)
         changed_files = [f for f in files if self.is_file_changed(f, ignore)]
         return changed_files
 

server.py

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 from livereload import Server, shell
 
 server = Server()

setup.cfg

@@ -1,5 +1,2 @@
-[bdist_wheel]
-universal = 1
-
 [metadata]
 license_file = LICENSE

setup.py

@@ -1,12 +1,11 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 import re
 from setuptools import setup
 
 
 def fread(filepath):
-    with open(filepath, 'r') as f:
+    with open(filepath) as f:
         return f.read()
 
 
@@ -33,12 +32,11 @@ def version():
         ]
     },
     install_requires=[
-        'tornado;python_version>"2.7"',
-        'tornado<6;python_version=="2.7"',
-        'six',
+        'tornado',
     ],
     license='BSD',
     include_package_data=True,
+    python_requires='>=3.6',
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Console',
@@ -49,13 +47,12 @@ def version():
         'Operating System :: MacOS :: MacOS X',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3 :: Only',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Software Development :: Build Tools',