feat: update code

Author: leafcoder

litefs.py

@@ -30,6 +30,7 @@
 from gzip import GzipFile
 from hashlib import sha1
 from imp import find_module, load_module, new_module as imp_new_module
+from io import RawIOBase, BufferedRWPair, DEFAULT_BUFFER_SIZE
 from mako import exceptions
 from mako.lookup import TemplateLookup
 from mimetypes import guess_type
@@ -49,52 +50,52 @@
 from watchdog.observers import Observer
 from weakref import proxy as weakref_proxy
 from zlib import compress as zlib_compress
-from io import RawIOBase, BufferedRWPair, DEFAULT_BUFFER_SIZE
 
 PY3 = sys.version_info.major > 2
 
 if PY3:
     # Import modules in py3
     import socket
+    from collections import UserDict
     from http.client import responses as http_status_codes
     from http.cookies import SimpleCookie
     from io import BytesIO as StringIO
     from urllib.parse import splitport, unquote_plus
-    from collections import UserDict
     def is_unicode(s):
         return isinstance(s, str)
     def is_bytes(s):
         return isinstance(s, bytes)
 else:
     # Import modules in py2
     import _socket as socket
-    from Cookie import SimpleCookie
     from cStringIO import StringIO
     from httplib import responses as http_status_codes
     from urllib import splitport, unquote_plus
+    from Cookie import SimpleCookie
     from UserDict import UserDict
     def is_unicode(s):
         return isinstance(s, unicode)
     def is_bytes(s):
         return isinstance(s, basestring)
 
 server_name = 'litefs'
-server_software = 'litefs %s' % __version__
+server_software = '%s %s' % (server_name, __version__)
 
 default_404 = 'not_found'
 default_sid = '%s.sid' % server_name
-default_content_type = 'text/plain'
+default_content_type = 'text/plain; charset=utf-8'
 
 EOFS = ('', '\n', '\r\n')
-FILES_HEADER_NAME = 'litefs.files'
+FILES_HEADER_NAME = '%s.files' % server_name
 date_format = '%Y/%m/%d %H:%M:%S'
 should_retry_error = (EWOULDBLOCK, EAGAIN)
 double_slash_sub = re.compile(r'\/{2,}').sub
 startswith_dot_sub = re.compile(r'\/\.+').sub
 suffixes = ('.py', '.pyc', '.pyo', '.so', '.mako')
 cgi_suffixes = ('.pl', '.py', '.pyc', '.pyo', '.php')
 form_dict_match = re.compile(r'(.+)\[([^\[\]]+)\]').match
-server_info = 'litefs/%s python/%s' % (__version__, sys.version.split()[0])
+server_info = '%s/%s python/%s' \
+    % (server_name, __version__, sys.version.split()[0])
 cgi_runners = {
     '.pl' : '/usr/bin/perl',
     '.py' : '/usr/bin/python',
@@ -1028,7 +1029,7 @@ def _handler(self):
             fp, pathname, description = find_module(name, [realbase])
         except ImportError:
             return None
-        module_name = 'litefs_%s' % uuid4().hex
+        module_name = '%s_%s' % (server_name, uuid4().hex)
         sys.dont_write_bytecode = True
         try:
             module = load_module(module_name, fp, pathname, description)

setup.py

@@ -32,17 +32,12 @@ def get_long_str(var_name):
     return re.search(
         r"%s\s*=\s*['\"]{3}([^'\"]+)['\"]{3}" % var_name, src_py).group(1)
 
-version = get_str('__version__')
-author  = get_str('__author__')
-license = get_str('__license__')
-long_description = get_long_str('__doc__')
-
 setup(
     name='litefs',
-    version=version,
+    version=get_str('__version__'),
     description='Build a web server framework using Python.',
-    long_description=long_description,
-    author=author,
+    long_description=get_long_str('__doc__'),
+    author=get_str('__author__'),
     author_email='leafcoder@gmail.com',
     url='https://github.com/leafcoder/litefs',
     py_modules=['litefs'],
@@ -52,7 +47,7 @@ def get_long_str(var_name):
             'language_level' : language_level
         }
     ),
-    license=license,
+    license=get_str('__license__'),
     platforms='any',
     package_data={
         '': ['*.txt', '*.md', 'LICENSE', 'example.py', 'MANIFEST.in'],