Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'find_bugs'

Conflicts:
	zbox_wiki/commons/web/wsgiserver/LICENSE.txt
	zbox_wiki/main.py
  • Loading branch information...
commit 6b3899c2daacfffc44f2268b771d7fe7cd7d8f98 2 parents ca9b117 + 4d477b4
Shuge Lee authored
6 setup.py
View
@@ -45,9 +45,9 @@
"zbox_wiki.commons",
"zbox_wiki.commons.markdown",
"zbox_wiki.commons.markdown.extensions",
- "zbox_wiki.web",
- "zbox_wiki.web.contrib",
- "zbox_wiki.web.wsgiserver",
+ "zbox_wiki.commons.web",
+ "zbox_wiki.commons.web.contrib",
+ "zbox_wiki.commons.web.wsgiserver",
],
package_data = {
0  zbox_wiki/web/__init__.py → zbox_wiki/commons/web/__init__.py
View
File renamed without changes
0  zbox_wiki/web/application.py → zbox_wiki/commons/web/application.py
View
File renamed without changes
0  zbox_wiki/web/browser.py → zbox_wiki/commons/web/browser.py
View
File renamed without changes
0  zbox_wiki/web/contrib/__init__.py → zbox_wiki/commons/web/contrib/__init__.py
View
File renamed without changes
0  zbox_wiki/web/contrib/template.py → zbox_wiki/commons/web/contrib/template.py
View
File renamed without changes
0  zbox_wiki/web/db.py → zbox_wiki/commons/web/db.py
View
File renamed without changes
0  zbox_wiki/web/debugerror.py → zbox_wiki/commons/web/debugerror.py
View
File renamed without changes
0  zbox_wiki/web/form.py → zbox_wiki/commons/web/form.py
View
File renamed without changes
0  zbox_wiki/web/http.py → zbox_wiki/commons/web/http.py
View
File renamed without changes
0  zbox_wiki/web/httpserver.py → zbox_wiki/commons/web/httpserver.py
View
File renamed without changes
0  zbox_wiki/web/net.py → zbox_wiki/commons/web/net.py
View
File renamed without changes
0  zbox_wiki/web/python23.py → zbox_wiki/commons/web/python23.py
View
File renamed without changes
0  zbox_wiki/web/session.py → zbox_wiki/commons/web/session.py
View
File renamed without changes
10 zbox_wiki/web/template.py → zbox_wiki/commons/web/template.py
View
@@ -1049,11 +1049,11 @@ def _load_template(self, name):
render = Render
# setup render for Google App Engine.
-try:
- from google import appengine
- render = Render = GAE_Render
-except ImportError:
- pass
+#try:
+# from google import appengine
+# render = Render = GAE_Render
+#except ImportError:
+# pass
def frender(path, **keywords):
"""Creates a template from the given file path.
0  zbox_wiki/web/test.py → zbox_wiki/commons/web/test.py
View
File renamed without changes
0  zbox_wiki/web/utils.py → zbox_wiki/commons/web/utils.py
View
File renamed without changes
0  zbox_wiki/web/webapi.py → zbox_wiki/commons/web/webapi.py
View
File renamed without changes
0  zbox_wiki/web/webopenid.py → zbox_wiki/commons/web/webopenid.py
View
File renamed without changes
0  zbox_wiki/web/wsgi.py → zbox_wiki/commons/web/wsgi.py
View
File renamed without changes
0  zbox_wiki/web/wsgiserver/__init__.py → zbox_wiki/commons/web/wsgiserver/__init__.py
View
File renamed without changes
0  zbox_wiki/web/wsgiserver/ssl_builtin.py → zbox_wiki/commons/web/wsgiserver/ssl_builtin.py
View
File renamed without changes
0  zbox_wiki/web/wsgiserver/ssl_pyopenssl.py → zbox_wiki/commons/web/wsgiserver/ssl_pyopenssl.py
View
File renamed without changes
5 zbox_wiki/main.py
View
@@ -6,14 +6,15 @@
import re
import shutil
import time
-import web
-import commons
try:
import conf
except ImportError:
import default_conf as conf
+import commons
+from commons import web
+
__all__ = [
"app",
Please sign in to comment.
Something went wrong with that request. Please try again.