feat: change to compatible with python3

Author: leafcoder

.gitignore

@@ -8,3 +8,4 @@ dist/
 *.egg-info/
 .eggs/
 build/
+*.so

litefs.py

@@ -13,7 +13,7 @@
 License: MIT (see LICENSE for details)
 '''
 
-__version__ = '0.2.4'
+__version__ = '0.3.0'
 __author__  = 'Leafcoder'
 __license__ = 'MIT'
 
@@ -163,6 +163,11 @@ def log_error(logger, message=None):
         message = 'error occured'
     logger.error(message, exc_info=True)
 
+def log_info(logger, message=None):
+    if message is None:
+        message = 'info'
+    logger.info(message)
+
 def log_debug(logger, message=None):
     if message is None:
         message = 'debug'
@@ -351,6 +356,8 @@ def on_moved(self, event):
             return
         if not dest_path.startswith(webroot+'/'):
             return
+        log_info(self._app.logger, '%s has been moved to %s' \
+            % (src_path, dest_path))
         src_path  = '/%s' % src_path [len(webroot):].strip('/')
         dest_path = '/%s' % dest_path[len(webroot):].strip('/')
         caches = self._app.caches
@@ -375,6 +382,7 @@ def on_created(self, event):
             return
         if not src_path.startswith(webroot+'/'):
             return
+        log_info(self._app.logger, '%s has been modified' % src_path)
         src_path = '/%s' % src_path[len(webroot):].strip('/')
         caches = self._app.caches
         files = self._app.files
@@ -1134,7 +1142,7 @@ class Litefs(object):
 
     def __init__(self, **kwargs):
         self.config = config = make_config(**kwargs)
-        level = logging.DEBUG if config.debug else logging.ERROR
+        level = logging.DEBUG if config.debug else logging.INFO
         self.logger = make_logger(__name__, level=level)
         self.server_info = server_info = make_server(
             config.address, request_size=config.request_size

requirements.txt

@@ -1,4 +1,6 @@
 argh==0.26.2
+argparse==1.2.1
+Cython==0.29.14
 greenlet==0.4.13
 Mako==1.0.6
 MarkupSafe==1.0

setup.py

@@ -16,9 +16,10 @@
     from Cython.Build import cythonize
 
 long_description = '''\
-使用 Python 从零开始构建一个 Web 服务器框架。 开发 Litefs 的是为了实现一个能快速、安\
-全、灵活的构建 Web 项目的服务器框架。 Litefs 是一个高性能的 HTTP 服务器。Litefs 具有高\
-稳定性、丰富的功能、系统消耗低的特点。
+Build a web server framework using Python. Litefs was developed to imple\
+ment a server framework that can quickly, securely, and flexibly build Web \
+projects. Litefs is a high-performance HTTP server. Litefs has the characte\
+ristics of high stability, rich functions, and low system consumption.
 
 Name: leafcoder
 Email: leafcoder@gmail.com
@@ -27,35 +28,34 @@
 License: MIT (see LICENSE for details)
 '''
 
-__version__ = '0.2.4'
+__version__ = '0.3.0'
 __author__  = 'Leafcoder'
 __license__ = 'MIT'
 
+language_level = 2
+if sys.version_info[0] > 2:
+    language_level = 3
+
 setup(
     name='litefs',
     version=__version__,
-    description='使用 Python 从零开始构建一个 Web 服务器框架。',
+    description='Build a web server framework using Python.',
     long_description=__doc__,
     author=__author__,
     author_email='leafcoder@gmail.com',
     url='https://github.com/leafcoder/litefs',
     py_modules=['litefs'],
-    ext_modules=cythonize('litefs.py'),
+    ext_modules=cythonize(
+        'litefs.py',
+        compiler_directives={
+            'language_level' : language_level
+        }
+    ),
     license=__license__,
     platforms='any',
     package_data={
         '': ["*.txt", 'LICENSE'],
-        'demo': ['site/*', '*.py']
+        'site': ['site/*', '*.py']
     },
-    install_requires=[
-        'Mako==1.0.6',
-        'MarkupSafe==1.0',
-        'greenlet==0.4.13',
-        'PyYAML==3.12',
-        'argh==0.26.2',
-        'argparse==1.2.1',
-        'pathtools==0.1.2',
-        'watchdog==0.8.3',
-        'wsgiref==0.1.2'
-    ]
+    install_requires=open('requirements.txt').read().split('\n')
 )

site/database/index.html.py

@@ -1,11 +1,20 @@
 #-*- coding: utf-8 -*-
 
 def handler(self):
-    return '''
-    <ul>
-        <li><a href="helloworld">Hello World</a></li>
-        <li><a href="pathinfo">环境变量 PATH_INFO</a></li>
-        <li><a href="upload.html">文件上传</a></li>
-        <li><a href="form.html">表单数据</a></li>
-    </ul>
-    '''
+    yield '<h1>Environ</h1>'
+    for k, v in self.environ.items():
+        yield '{}: {}'.format(k, v)
+        yield '<br>'
+
+    yield '<h1>Form</h1>'
+    yield self.form
+    yield '<br>'
+
+    yield '<h1>Files</h1>'
+    files = self.files
+    for fp in files.values():
+        print(dir(fp))
+        yield '<div><textarea style="width: 100%" rows=10>'
+        yield fp.read()
+        yield '</textarea></div>'
+        yield '<br>'

site/demo.py

@@ -1,4 +1,3 @@
-
 <pre>
 PATH_INFO   : ${http.path_info}
 QUERY_STRING: ${http.query_string}