# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1281022089 -7200
# Node ID 012451a812f1abd21e7e30f887f8f2ba90f58b4b
# Parent  92e78a11e8dff875a698afe691b1e7dde0383734# Parent  a2711e44ba5de8b1675d7e0ee6aaa4a6c56a9b46
Merge with a2711e44ba5de8b1675d7e0ee6aaa4a6c56a9b46

diff -r a2711e44ba5d -r 012451a812f1 .pydevproject
--- a/.pydevproject	Sun Jun 06 03:17:50 2010 +0200
+++ b/.pydevproject	Thu Aug 05 17:28:09 2010 +0200
@@ -3,12 +3,12 @@
 
 <pydev_project>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Blinkster</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/blinkster/web/blinkster</path>
 <path>/blinkster/web/lib</path>
 </pydev_pathproperty>
 <pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
-<path>/Users/ymh/dev/workspace/blinkster/sbin/blinkster/lib/python2.6/site-packages</path>
+<path>/Volumes/Data/Dev/workspace/blinkster/sbin/bvenv/lib/python2.5/site-packages</path>
 </pydev_pathproperty>
 </pydev_project>
diff -r a2711e44ba5d -r 012451a812f1 sbin/create_python_env.py
--- a/sbin/create_python_env.py	Sun Jun 06 03:17:50 2010 +0200
+++ b/sbin/create_python_env.py	Thu Aug 05 17:28:09 2010 +0200
@@ -143,7 +143,7 @@
             if sys.version_info >= (2,6):
                 destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386\\n")
             else:
-                destination.write("JCC=$(PYTHON) -m jcc --shared --arch x86_64 --arch i386\\n")
+                destination.write("JCC=$(PYTHON) -m jcc --shared\\n")
             destination.write("NUM_FILES=2\\n")
         elif system_str == "Windows":
             destination.write("JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64 --arch i386\\n")
diff -r a2711e44ba5d -r 012451a812f1 web/blinkster/handler.py
--- a/web/blinkster/handler.py	Sun Jun 06 03:17:50 2010 +0200
+++ b/web/blinkster/handler.py	Thu Aug 05 17:28:09 2010 +0200
@@ -1,11 +1,36 @@
 
-#activate_this = '/Users/ymh/dev/workspace/blinkster/sbin/blinkster/bin/activate_this.py'
-#execfile(activate_this, dict(__file__=activate_this))
+activate_this = '/Users/ymh/dev/workspace/blinkster/sbin/bvenv/bin/activate_this.py'
+execfile(activate_this, dict(__file__=activate_this))
+
+#ALLDIRS = ['/Users/ymh/dev/workspace/blinkster/sbin/bvenv/lib/python2.5/site-packages']
+
+##import sys 
+#import site 
+
+#prev_sys_path = list(sys.path) 
+
+# Add each new site-packages directory.
+#for directory in ALLDIRS:
+#    site.addsitedir(directory)
 
-import django.core.handlers.modpython
-#from django.core.handlers.modpython import handler
+# Reorder sys.path so new directories at the front.
+#new_sys_path = [] 
+#for item in list(sys.path): 
+#    if item not in prev_sys_path: 
+#        new_sys_path.append(item) 
+#        sys.path.remove(item) 
+#sys.path[:0] = new_sys_path 
+
 
-def handler(req):
-    activate_this = req.get_options().get("virtualenv.activate_path")
-    execfile(activate_this, dict(__file__=activate_this))    
-    return django.core.handlers.modpython.handler(req)
\ No newline at end of file
+#import django.core.handlers.modpython
+from django.core.handlers.modpython import handler
+
+
+
+
+#def handler(req):
+#    activate_this = req.get_options().get("virtualenv.activate_path")
+#    execfile(activate_this, dict(__file__=activate_this))
+    # Remember original sys.path.
+
+#    return django.core.handlers.modpython.handler(req)
\ No newline at end of file