Upgrade Python syntax with pyupgrade --py3-plus

hugovk · hugovk · commit fdcfae210cf5 · 2021-08-20T10:31:15.000+03:00
diff --git a/docs/conf.py b/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'),
 ]
 
diff --git a/livereload/handlers.py b/livereload/handlers.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     livereload.handlers
     ~~~~~~~~~~~~~~~~~~~
diff --git a/livereload/server.py b/livereload/server.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     livereload.server
     ~~~~~~~~~~~~~~~~~
@@ -94,8 +93,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 +102,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 +141,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 +172,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,7 +237,7 @@ 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)
@@ -332,7 +330,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('Serving on http://{}:{}'.format(host, port))
 
         self.default_filename = default_filename
 
@@ -346,7 +344,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('http://{}:{}'.format(host, port))
             threading.Thread(target=opener).start()
 
         try:
diff --git a/livereload/watcher.py b/livereload/watcher.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     livereload.watcher
     ~~~~~~~~~~~~~~~~~~
@@ -28,7 +27,7 @@
 logger = logging.getLogger('livereload')
 
 
-class Watcher(object):
+class Watcher:
     """A file watcher registry."""
     def __init__(self):
         self._tasks = {}
diff --git a/server.py b/server.py
@@ -1,5 +1,3 @@
-# coding: utf-8
-
 from livereload import Server, shell
 
 server = Server()
diff --git a/setup.py b/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()
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`	`"""`
`3`	`2`	`livereload.handlers`
`4`	`3`	`~~~~~~~~~~~~~~~~~~~`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-# coding: utf-8`
`2`		`-`
`3`	`1`	`from livereload import Server, shell`
`4`	`2`
`5`	`3`	`server = Server()`