| 1 |
commit: 20fe069692a9818c41059c3ebcfef3dce39c258e |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 23 17:39:09 2020 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 4 15:48:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/g-sorcery.git/commit/?id=20fe0696 |
| 7 |
|
| 8 |
tests/server/py: Fix an inheritence error in py 3.7, 3.8 |
| 9 |
|
| 10 |
self.directory was being overridden by the super class instance. |
| 11 |
Rename this local variable to prevent it being overridden. |
| 12 |
|
| 13 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
| 14 |
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> |
| 15 |
|
| 16 |
tests/server.py | 14 +++++++------- |
| 17 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 18 |
|
| 19 |
diff --git a/tests/server.py b/tests/server.py |
| 20 |
index 6a32a2d..aa895ea 100644 |
| 21 |
--- a/tests/server.py |
| 22 |
+++ b/tests/server.py |
| 23 |
@@ -4,9 +4,9 @@ |
| 24 |
""" |
| 25 |
server.py |
| 26 |
~~~~~~~~~ |
| 27 |
- |
| 28 |
+ |
| 29 |
test server |
| 30 |
- |
| 31 |
+ |
| 32 |
:copyright: (c) 2013 by Jauhien Piatlicki |
| 33 |
:license: GPL-2, see LICENSE for more details. |
| 34 |
""" |
| 35 |
@@ -18,7 +18,7 @@ import time |
| 36 |
from g_sorcery.compatibility import py2k |
| 37 |
|
| 38 |
if py2k: |
| 39 |
- from SocketServer import TCPServer as HTTPServer |
| 40 |
+ from SocketServer import TCPServer as HTTPServer |
| 41 |
from SimpleHTTPServer import SimpleHTTPRequestHandler |
| 42 |
else: |
| 43 |
from http.server import HTTPServer |
| 44 |
@@ -27,24 +27,24 @@ else: |
| 45 |
def HTTPRequestHandlerGenerator(direct): |
| 46 |
|
| 47 |
class HTTPRequestHandler(SimpleHTTPRequestHandler, object): |
| 48 |
- directory = direct |
| 49 |
|
| 50 |
def __init__(self, request, client_address, server): |
| 51 |
+ self.direct = direct |
| 52 |
super(HTTPRequestHandler, self).__init__(request, client_address, server) |
| 53 |
|
| 54 |
def translate_path(self, path): |
| 55 |
- return os.path.join(self.directory, path[1:]) |
| 56 |
+ return os.path.join(self.direct, path[1:]) |
| 57 |
|
| 58 |
return HTTPRequestHandler |
| 59 |
|
| 60 |
- |
| 61 |
+ |
| 62 |
class Server(threading.Thread): |
| 63 |
def __init__(self, directory, port=8080): |
| 64 |
super(Server, self).__init__() |
| 65 |
HTTPServer.allow_reuse_address = True |
| 66 |
server_address = ('127.0.0.1', port) |
| 67 |
self.httpd = HTTPServer(server_address, HTTPRequestHandlerGenerator(directory)) |
| 68 |
- |
| 69 |
+ |
| 70 |
def run(self): |
| 71 |
self.httpd.serve_forever() |
Archives