Initial version of Python 2.7 of micolog, buggy and not recommend to …

…use production env

admin.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 import wsgiref.handlers
 from django.conf import settings
 settings._target = None
@@ -232,8 +230,8 @@ def action_pingback_ping(self):
 
 
 class admin_tools(base.BaseRequestHandler):
-    def __init__(self):
-        base.BaseRequestHandler.__init__(self)
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current="config"
 
     @base.requires_admin
@@ -242,8 +240,8 @@ def get(self,slug=None):
 
 
 class admin_sitemap(base.BaseRequestHandler):
-    def __init__(self):
-        base.BaseRequestHandler.__init__(self)
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current="config"
 
     @base.requires_admin
@@ -283,8 +281,8 @@ def post(self):
         self.render2('views/admin/sitemap.html',{})
 
 class admin_import(base.BaseRequestHandler):
-    def __init__(self):
-        base.BaseRequestHandler.__init__(self)
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current='config'
 
     @base.requires_admin
@@ -330,7 +328,8 @@ def get(self,slug=None):
 ##			self.render2('views/admin/import.html',{'error':'import faiure.'})
 
 class admin_setup(base.BaseRequestHandler):
-    def __init__(self):
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current='config'
 
     @base.requires_admin
@@ -380,8 +379,8 @@ def post(self):
         self.render2('views/admin/setup.html',vals)
 
 class admin_entry(base.BaseRequestHandler):
-    def __init__(self):
-        base.BaseRequestHandler.__init__(self)
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current='write'
 
     @base.requires_admin
@@ -736,8 +735,8 @@ def post(self):
                     self.render2('views/admin/link.html',vals)
 
 class admin_category(base.BaseRequestHandler):
-    def __init__(self):
-        base.BaseRequestHandler.__init__(self)
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current='categories'
 
     @base.requires_admin
@@ -855,8 +854,8 @@ def post(self,slug=None):
             self.redirect('/admin/authors')
 
 class admin_author(base.BaseRequestHandler):
-    def __init__(self):
-        base.BaseRequestHandler.__init__(self)
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current='authors'
 
     @base.requires_admin
@@ -909,8 +908,8 @@ def post(self):
                     self.render2('views/admin/author.html',vals)
 
 class admin_plugins(base.BaseRequestHandler):
-    def __init__(self):
-        base.BaseRequestHandler.__init__(self)
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current='plugins'
 
     @base.requires_admin
@@ -931,8 +930,8 @@ def post(self):
             self.render2('views/admin/plugins.html',vals)
 
 class admin_plugins_action(base.BaseRequestHandler):
-    def __init__(self):
-        base.BaseRequestHandler.__init__(self)
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current='plugins'
 
     @base.requires_admin
@@ -1038,8 +1037,8 @@ def post(self):
         self.write(simplejson.dumps({'name':media.name,'size':media.size,'id':str(media.key())}))
 
 class FileManager(base.BaseRequestHandler):
-    def __init__(self):
-        base.BaseRequestHandler.__init__(self)
+    def initialize(self, request, response):
+        base.BaseRequestHandler.initialize(self, request, response)
         self.current = 'files'
 
     @base.requires_admin

api_rpc.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import cgi,os,sys
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 import wsgiref.handlers
 import xmlrpclib
 from xmlrpclib import Fault

app.yaml.sample

@@ -1,7 +1,12 @@
 application: mlog
 version: 1
-runtime: python
+runtime: python27
 api_version: 1
+threadsafe: False
+
+libraries:
+- name: django
+  version: "1.2"
 
 handlers:
 - url: /favicon\.ico

app/filter.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 from django import template
 from model import *
 import django.template.defaultfilters as defaultfilters

app/recurse.py

@@ -1,7 +1,5 @@
 import os
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 from django.template import Library
 from django.template import Node, NodeList
 from django.template import TemplateSyntaxError, VariableDoesNotExist

base.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import os,logging
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 import functools
 from google.appengine.api import users
 from google.appengine.ext import webapp
@@ -21,6 +19,8 @@
 import traceback
 import micolog_template
 
+micolog_template.register_template_library('app.filter')
+micolog_template.register_template_library('app.recurse')
 
 logging.info('module base reloaded')
 def urldecode(value):
@@ -224,14 +224,9 @@ def fetch(self, p):
 
 
 class BaseRequestHandler(webapp.RequestHandler):
-    def __init__(self):
-        self.current='home'
-
-##	def head(self, *args):
-##		return self.get(*args)
-
     def initialize(self, request, response):
         webapp.RequestHandler.initialize(self, request, response)
+        self.current='home'
         os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
         from model import g_blog,User
         self.blog = g_blog

blog.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import cgi, os
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 import wsgiref.handlers
 
 # Google App Engine imports.
@@ -655,8 +653,6 @@ def getZipHandler(**args):
     return ('/xheditor/(.*)',zipserve.make_zip_handler('''D:\\Projects\\eric-guo\\plugins\\xheditor\\xheditor.zip'''))
 
 def main():
-    webapp.template.register_template_library('app.filter')
-    webapp.template.register_template_library('app.recurse')
     urls=	[('/media/([^/]*)/{0,1}.*',getMedia),
             ('/checkimg/', CheckImg),
             ('/checkcode/', CheckCode),
@@ -670,7 +666,7 @@ def main():
             ('/category/(.*)',entriesByCategory),
             ('/(\d{4})/(\d{1,2})',archive_by_month),
             ('/tag/(.*)',entriesByTag),
-            #('/\?p=(?P<postid>\d+)',SinglePost),
+            ('/\?p=(?P<postid>\d+)',SinglePost),
             ('/', MainPage),
             ('/do/(\w+)', do_action),
             ('/e/(.*)',Other),

micolog_template.py

@@ -44,8 +44,6 @@
 
 import hashlib
 import os,logging
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 import django
 
 import django.conf

model.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import os,logging
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 from google.appengine.ext import db
 from google.appengine.ext.db import Model as DBModel
 from google.appengine.api import memcache
@@ -868,7 +866,9 @@ def InitBlogData():
 
     entry=Entry(title="Hello world!".decode('utf8'))
     entry.content='<p>Welcome to micolog %s. This is your first post. Edit or delete it, then start blogging!</p>'%g_blog.version
+    entry.slug='welcome_to_micolog'
     entry.save(True)
+
     link=Link(href='http://xuming.net',linktext="Xuming's blog".decode('utf8'))
     link.put()
     link=Link(href='http://eric.cloud-mes.com/',linktext="Eric Guo's blog".decode('utf8'))

theme_files.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 import  os,sys,stat
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 import wsgiref.handlers
 from mimetypes import types_map
 from datetime import  timedelta

ziploader/zip_loader.py

@@ -1,8 +1,6 @@
 # Wrapper for loading templates from zipfile.
 import zipfile,logging,os
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-from google.appengine.dist import use_library
-use_library('django', '1.2')
 from django.template import TemplateDoesNotExist
 from django.conf import settings
 logging.debug("zipload imported")