R-2.13.4

Makefile

@@ -11,7 +11,7 @@ clean:
 	find ./ -name '*.rej' -exec rm -f {} \; 
 	find ./ -name '#*' -exec rm -f {} \;
 	find ./ -name 'Thumbs.db' -exec rm -f {} \; 
-	find ./gluon/ -name '.*' -exec rm -f {} \;
+	# find ./gluon/ -name '.*' -exec rm -f {} \;
 	find ./gluon/ -name '*class' -exec rm -f {} \; 
 	find ./applications/admin/ -name '.*' -exec rm -f {} \; 
 	find ./applications/examples/ -name '.*' -exec rm -f {} \; 
@@ -32,7 +32,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.13.3-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.13.4-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps

gluon/contrib/login_methods/ldap_auth.py

@@ -432,7 +432,8 @@ def ldap_auth(server='ldap',
                     # #############
                     fields = ['first_name', 'last_name']
                     user_in_db = db(db.auth_user.email == username)
-                update_or_insert_values = {f: update_or_insert_values[f] for f in fields}
+                    update_or_insert_values = dict(((f, update_or_insert_values[f]) for f in fields))
+
                 if user_in_db.count() > 0:
                     actual_values = user_in_db.select(*[db.auth_user[f] for f in fields]).first().as_dict()
                     if update_or_insert_values != actual_values:  # We don't update record if values are the same

web2py.py

@@ -3,7 +3,6 @@
 
 import os
 import sys
-import gluon.widget
 from multiprocessing import freeze_support
 # import gluon.import_all ##### This should be uncommented for py2exe.py
 
@@ -17,6 +16,10 @@ os.chdir(path)
 
 sys.path = [path] + [p for p in sys.path if not p == path]
 
+# important that this import is after the os.chdir
+
+import gluon.widget
+
 # Start Web2py and Web2py cron service!
 if __name__ == '__main__':
     freeze_support()