Merge branch 'master' of github.com:rmehta/wnframework

cgi-bin/webnotes/auth.py

@@ -170,7 +170,7 @@ class LoginManager:
 	# --------
 	def run_trigger(self, method='on_login'):
 		try:
-			import event_handlers
+			from startup import event_handlers
 			if hasattr(event_handlers, method):
 				getattr(event_handlers, method)(self)
 			return

cgi-bin/webnotes/modules/import_module.py

@@ -12,7 +12,7 @@ def import_module(module, verbose=0):
 	from webnotes.modules import get_module_path
 	import os
 	
-	not_module = ('startup', 'event_handlers', 'files', 'patches')
+	not_module = ('startup', 'files', 'patches')
 	if module in not_module: 
 		if verbose: webnotes.msgprint('%s is not a module' % module)
 		return

cgi-bin/webnotes/utils/sitemap.py

@@ -25,10 +25,10 @@ def generate_xml(conn, site_prefix):
 		
 		# list of all Records that are viewable by guests (Blogs, Articles etc)
 		try:
-			from event_handlers import get_sitemap_items
+			from startup.event_handlers import get_sitemap_items
 			for i in get_sitemap_items(site_prefix):
 				site_map += link_xml % (i[0], i[1])
 		except ImportError, e:
 			pass
 
-	return frame_xml % site_map
+	return frame_xml % site_map