Skip to content
  • 6 commits
  • 27 files changed
  • 0 commit comments
  • 1 contributor
View
7 makefile
@@ -1,3 +1,10 @@
+upload:
+ python setup.py sdist upload
+
all:
python setup.py sdist upload
python setup.py egg_info bdist_egg upload
+ rm -rf dist/ build/
+
+clean:
+ rm -rf dist/ build/
View
6 setup.py
@@ -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 = {
View
16 zbox_wiki/__init__.py
@@ -1,18 +1,6 @@
#!/usr/bin/env python
-"""
-Self-contains
- - markdown-2.1.0
- - web.py-0.36-r1 (shuge/webpy was forked from webpy/webpy,
- enhance custom static file path)
- - argparse-1.2.1
-
-"""
-
-__author__ = [
- "Shuge Lee <shuge.lee@gmail.com>",
- ]
-
-__license__ = "MIT License"
+from __future__ import generators
+from __future__ import with_statement
from main import *
View
1 zbox_wiki/commons/__init__.py
@@ -2,7 +2,6 @@
from __future__ import generators
from __future__ import with_statement
-from __future__ import print_function
import mdutils
import netutils
View
0 zbox_wiki/web/__init__.py → zbox_wiki/commons/web/__init__.py
File renamed without changes.
View
0 zbox_wiki/web/application.py → zbox_wiki/commons/web/application.py
File renamed without changes.
View
0 zbox_wiki/web/browser.py → zbox_wiki/commons/web/browser.py
File renamed without changes.
View
0 zbox_wiki/web/contrib/__init__.py → zbox_wiki/commons/web/contrib/__init__.py
File renamed without changes.
View
0 zbox_wiki/web/contrib/template.py → zbox_wiki/commons/web/contrib/template.py
File renamed without changes.
View
0 zbox_wiki/web/db.py → zbox_wiki/commons/web/db.py
File renamed without changes.
View
0 zbox_wiki/web/debugerror.py → zbox_wiki/commons/web/debugerror.py
File renamed without changes.
View
0 zbox_wiki/web/form.py → zbox_wiki/commons/web/form.py
File renamed without changes.
View
0 zbox_wiki/web/http.py → zbox_wiki/commons/web/http.py
File renamed without changes.
View
0 zbox_wiki/web/httpserver.py → zbox_wiki/commons/web/httpserver.py
File renamed without changes.
View
0 zbox_wiki/web/net.py → zbox_wiki/commons/web/net.py
File renamed without changes.
View
0 zbox_wiki/web/python23.py → zbox_wiki/commons/web/python23.py
File renamed without changes.
View
0 zbox_wiki/web/session.py → zbox_wiki/commons/web/session.py
File renamed without changes.
View
10 zbox_wiki/web/template.py → zbox_wiki/commons/web/template.py
@@ -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.
View
0 zbox_wiki/web/test.py → zbox_wiki/commons/web/test.py
File renamed without changes.
View
0 zbox_wiki/web/utils.py → zbox_wiki/commons/web/utils.py
File renamed without changes.
View
0 zbox_wiki/web/webapi.py → zbox_wiki/commons/web/webapi.py
File renamed without changes.
View
0 zbox_wiki/web/webopenid.py → zbox_wiki/commons/web/webopenid.py
File renamed without changes.
View
0 zbox_wiki/web/wsgi.py → zbox_wiki/commons/web/wsgi.py
File renamed without changes.
View
0 zbox_wiki/web/wsgiserver/__init__.py → zbox_wiki/commons/web/wsgiserver/__init__.py
File renamed without changes.
View
0 zbox_wiki/web/wsgiserver/ssl_builtin.py → ...iki/commons/web/wsgiserver/ssl_builtin.py
File renamed without changes.
View
0 zbox_wiki/web/wsgiserver/ssl_pyopenssl.py → ...i/commons/web/wsgiserver/ssl_pyopenssl.py
File renamed without changes.
View
14 zbox_wiki/main.py
@@ -5,16 +5,17 @@
import os
import re
import shutil
-import sys
import time
-import web
-import commons
try:
import conf
except ImportError:
import default_conf as conf
+import commons
+from commons import web
+
+
__all__ = [
"app",
@@ -158,7 +159,8 @@ def get_page_file_list_by_req_path(req_path, sort_by_modified_ts = False, max_de
cmd += " | head -n %d " % limit
msg = ">>> " + cmd
- # sys.stdout.write("\n" + msg + "\n")
+ if web.config.debug:
+ print msg
buf = os.popen(cmd).read().strip()
@@ -292,11 +294,11 @@ def search_by_filename_and_file_content(keywords,
if web.config.debug:
msg = "find by filename >>> " + find_by_filename_cmd
- # sys.stdout.write("\n" + msg + "\n")
+ print msg
if web.config.debug:
msg = "find by content >>> " + find_by_content_cmd
- # sys.stdout.write("\n" + msg + "\n")
+ print msg
matched_content_lines = os.popen(find_by_content_cmd).read().strip()

No commit comments for this range

Something went wrong with that request. Please try again.