From 3b16abf829560014abd93a349909ca8389c86266 Mon Sep 17 00:00:00 2001
From: * <thurealrubiogame@gmail.com>
Date: Mon, 19 Jun 2023 09:06:46 -0400
Subject: [PATCH] various bug fixes and improvements

---
 livereload/__init__.py |  2 +-
 livereload/server.py   | 20 +++++++++++++++-----
 setup.py               | 22 +++++-----------------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/livereload/__init__.py b/livereload/__init__.py
index 68be292..766fcca 100644
--- a/livereload/__init__.py
+++ b/livereload/__init__.py
@@ -8,7 +8,7 @@
     :license: BSD, see LICENSE for more details.
 """
 
-__version__ = '2.6.3'
+__version__ = '2.6.3-1'
 __author__ = 'Hsiaoming Yang <me@lepture.com>'
 __homepage__ = 'https://github.com/lepture/python-livereload'
 
diff --git a/livereload/server.py b/livereload/server.py
index ec4e6f1..a4bddc8 100644
--- a/livereload/server.py
+++ b/livereload/server.py
@@ -98,8 +98,8 @@ def run_shell():
 
 
 class LiveScriptInjector(web.OutputTransform):
-    def __init__(self, request):
-        super().__init__(request)
+    #def __init__(self, request):
+    #    super().__init__(request)
 
     def transform_first_chunk(self, status_code, headers, chunk, finishing):
         if HEAD_END in chunk:
@@ -111,10 +111,20 @@ def transform_first_chunk(self, status_code, headers, chunk, finishing):
 
 
 class LiveScriptContainer(WSGIContainer):
-    def __init__(self, wsgi_app, script=''):
-        self.wsgi_app = wsgi_app
+    def __init__(self, wsgi_app, executor=None, script=b''):
+        super().__init__(wsgi_app, executor=executor)
         self.script = script
 
+    @property
+    def wsgi_app(self):
+        return self.wsgi_application
+    @wsgi_app.setter
+    def wsgi_app(self, wsgi_app):
+        self.wsgi_application = wsgi_app
+    @wsgi_app.deleter
+    def wsgi_app(self):
+        del self.wsgi_application
+
     def __call__(self, request):
         data = {}
         response = []
@@ -125,7 +135,7 @@ def start_response(status, response_headers, exc_info=None):
             return response.append
 
         app_response = self.wsgi_app(
-            WSGIContainer.environ(request), start_response)
+            super().environ(request), start_response)
         try:
             response.extend(app_response)
             body = b"".join(response)
diff --git a/setup.py b/setup.py
index 1cbe18c..e82424b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,31 +1,19 @@
 #!/usr/bin/env python
 
-import re
 from setuptools import setup
-
-
-def fread(filepath):
-    with open(filepath) as f:
-        return f.read()
-
-
-def version():
-    content = fread('livereload/__init__.py')
-    pattern = r"__version__ = '([0-9\.dev]*)'"
-    m = re.findall(pattern, content)
-    return m[0]
-
+import re
 
 setup(
     name='livereload',
-    version=version(),
+    version=re.search(r"__version__ *= *[\"'](\d+(\.\d+)*(-(dev|\d+)))?[\"']", open(
+        "livereload/__init__.py").read()).group(1),
     author='Hsiaoming Yang',
     author_email='me@lepture.com',
     url='https://github.com/lepture/python-livereload',
     packages=['livereload', 'livereload.management.commands'],
     description='Python LiveReload is an awesome tool for web developers',
-    long_description_content_type='text/x-rst',
-    long_description=fread('README.md'),
+    long_description_content_type='text/markdown',
+    long_description=open("README.md").read(),
     entry_points={
         'console_scripts': [
             'livereload = livereload.cli:main',