Author: test
Date: 2005-12-19 18:54:07 +0000 (Mon, 19 Dec 2005)
New Revision: 1433
Modified:
FormEncode/trunk/formencode/variabledecode.py
Log:
Oops, didn't remove a conflict
Modified: FormEncode/trunk/formencode/variabledecode.py
===================================================================
--- FormEncode/trunk/formencode/variabledecode.py 2005-12-19 18:41:06 UTC
(rev 1432)
+++ FormEncode/trunk/formencode/variabledecode.py 2005-12-19 18:54:07 UTC
(rev 1433)
@@ -104,11 +104,8 @@
return result
-<<<<<<< .mine
-def variable_encode(d, prepend='', result=None, add_repetitions=True):
-=======
-def variable_encode(d, prepend='', result=None, dict_char='.', list_char='-'):
->>>>>>> .r1430
+def variable_encode(d, prepend='', result=None, add_repetitions=True,
+ dict_char='.', list_char='-'):
"""
Encodes a nested structure into a flat dictionary.
"""
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
FormEncode-CVS mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/formencode-cvs
