Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
etc: Add environment option to run init.d/ashd silently.
[ashd.git]
/
python3
/
ashd-wsgi3
diff --git
a/python3/ashd-wsgi3
b/python3/ashd-wsgi3
index
fa0b8b5
..
c10bfc9
100755
(executable)
--- a/
python3/ashd-wsgi3
+++ b/
python3/ashd-wsgi3
@@
-1,6
+1,6
@@
#!/usr/bin/python3
#!/usr/bin/python3
-import sys, os, getopt, socket, logging, time, locale, collections, signal
+import sys, os, getopt, socket, logging, time, locale, collections
.abc
, signal
import ashd.util, ashd.serve, ashd.htlib
try:
import pdm.srv
import ashd.util, ashd.serve, ashd.htlib
try:
import pdm.srv
@@
-148,10
+148,10
@@
def mkenv(req):
return env
def recode(thing):
return env
def recode(thing):
- if isinstance(thing, collections.ByteString):
+ if isinstance(thing, collections.
abc.
ByteString):
return thing
else:
return thing
else:
- return str(thing).encode("
latin-1
")
+ return str(thing).encode("
utf-8
")
class request(ashd.serve.wsgirequest):
def __init__(self, *, bkreq, **kw):
class request(ashd.serve.wsgirequest):
def __init__(self, *, bkreq, **kw):