解决冲突

leafcoder · leafcoder · commit e4c954915c9a · 2018-02-28T15:07:50.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,4 @@
+nohup.out
+lib/
+*.sublime-project
+*.sublime-workspace
diff --git a/litefs.py b/litefs.py
@@ -8,15 +8,15 @@
 Name: leozhang
 Email: leafcoder@gmail.com
 
-Copyright (c) 2017, Leo Zhang.
+Copyright (c) 2017, Leafcoder.
 License: MIT (see LICENSE for details)
 '''
 
 version_major = 0
 version_minor = 2
 version_build = 0
-__version__ = '%s.%s.%s-dev' % (version_major, version_minor, version_build)
-__author__  = 'Leo Zhang'
+__version__ = '%s.%s.%s' % (version_major, version_minor, version_build)
+__author__  = 'Leafcoder'
 __license__ = 'MIT'
 
 import logging
@@ -26,7 +26,7 @@
 from collections import deque
 from Cookie import SimpleCookie
 from cStringIO import StringIO
-from errno import ENOTCONN, EMFILE, EWOULDBLOCK, EAGAIN
+from errno import ENOTCONN, EMFILE, EWOULDBLOCK, EAGAIN, EPIPE
 from functools import partial
 from greenlet import greenlet, getcurrent, GreenletExit
 from gzip import GzipFile
@@ -1087,7 +1087,7 @@ def _handler_io(self, raw, address):
                 )
             httpfile._handler()
         except socket.error as e:
-            if e.errno == errno.EPIPE:
+            if e.errno == EPIPE:
                 raise GreenletExit
             raise
         except Exception as e:
diff --git a/setup.py b/setup.py
@@ -3,30 +3,32 @@
 
 import sys
 sys.dont_write_bytecode = True
+
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 from Cython.Build import cythonize
 
-__author__ = 'Leo Zhang'
-__version__ = '0.0.1-dev'
-__license__ = 'MIT'
+import litefs
+
+__author__  = litefs.__author__
+__version__ = litefs.__version__
+__license__ = litefs.__license__
 
-setup(name='litefs',
-      version=__version__,
-      description='使用 Python 从零开始构建一个 Web 服务器框架。',
-      long_description=(
-      '使用 Python 从零开始构建一个 Web 服务器框架。 开发 Litefs 的是为了实现一个能'
-      '快速、安全、灵活的构建 Web 项目的服务器框架。 litefs 是一个高性能的 Http 服务'
-      '器。Litefs 具有高稳定性、丰富的功能、系统消耗低的特点。'),
-      author=__author__,
-      author_email='leafcoder@gmail.com',
-      url='https://coding.net/u/leafcoder/p/litefs',
-      py_modules=['litefs'],
-      ext_modules=cythonize('litefs.py'),
-      scripts=['litefs.py'],
-      license='MIT',
-      platforms='any',
-      install_requires = open("requirements.pip").read().splitlines()
+print litefs.__doc__
+setup(
+    name='litefs',
+    version=__version__,
+    description='使用 Python 从零开始构建一个 Web 服务器框架。',
+    long_description=litefs.__doc__,
+    author=__author__,
+    author_email='leafcoder@gmail.com',
+    url='https://coding.net/u/leafcoder/p/litefs',
+    py_modules=['litefs'],
+    ext_modules=cythonize('litefs.py'),
+    scripts=['litefs.py'],
+    license=__license__,
+    platforms='any',
+    install_requires=open("requirements.pip").read().splitlines()
 )
diff --git a/site/form.html b/site/form.html
@@ -5,7 +5,13 @@
     <title>表单提交、支持jQuery提交格式</title>
 </head>
 <body>
-    <h1>表单提交</h1>
+    <h1>表单提交一</h1>
+    <form action="./form" method="post">
+        <div><input type="text" name="name"></div>
+        <br>
+        <div><input type="submit" value="提交" /></div>
+    </form>
+    <h1>表单提交二</h1>
     <form action="./form" method="post">
         <div><input type="text" name="name"></div>
         <br>
diff --git a/site/helloword.mako b/site/helloword.mako
@@ -0,0 +1,5 @@
+<%def name="handler(self)">
+    hello world
+
+    {{'Good'}}
+</%def>
diff --git a/site/pathinfo.py b/site/pathinfo.py
@@ -0,0 +1,4 @@
+def handler(self):
+    print self.environ
+    print self.path_info
+    return 'ok'
