From cc9d05671135f90c1d5dfc0db9065a29c4113bc8 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 13 May 2014 09:56:28 +0200
Subject: [PATCH] [FIX] website_crm, website_event_sale: remove stray prints

also do some trivial cleanup/simplification of website_crm while at it:

* Initialize a dict directly via literal
* Use straightforward dict copy instead of whatever that convoluted crap was
* Use gencomp for set creation
* Lift a pair of keysets to the original dict creation
---
 addons/website_crm/controllers/main.py        | 35 +++++++------------
 addons/website_event_sale/controllers/main.py |  1 -
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/addons/website_crm/controllers/main.py b/addons/website_crm/controllers/main.py
index 163e3ee9793..e3662ef40a0 100644
--- a/addons/website_crm/controllers/main.py
+++ b/addons/website_crm/controllers/main.py
@@ -23,38 +23,29 @@ class contactus(http.Controller):
             if kwargs.get(field):
                 values[field] = kwargs.pop(field)
         values.update(kwargs=kwargs.items())
-        print values
         return request.website.render("website.contactus", values)
 
     @http.route(['/crm/contactus'], type='http', auth="public", website=True, multilang=True)
     def contactus(self, description=None, partner_name=None, phone=None, contact_name=None, email_from=None, name=None, **kwargs):
-        post = {}
-        post['description'] = description
-        post['partner_name'] = partner_name
-        post['phone'] = phone
-        post['contact_name'] = contact_name
-        post['email_from'] = email_from
-        post['name'] = name
-
-        required_fields = ['contact_name', 'email_from', 'description']
-        error = set()
-        values = dict((key, post.get(key)) for key in post)
-        values['error'] = error
+        post = {
+            'description': description,
+            'partner_name': partner_name,
+            'phone': phone,
+            'contact_name': contact_name,
+            'email_from': email_from,
+            'name': name or contact_name,
+            'user_id': False,
+        }
 
         # fields validation
-        for field in required_fields:
-            if not post.get(field):
-                error.add(field)
+        error = set(field for field in ['contact_name', 'email_from', 'description']
+                    if not post.get(field))
+
+        values = dict(post, error=error)
         if error:
             values.update(kwargs=kwargs.items())
             return request.website.render("website.contactus", values)
 
-        # if not given: subject is contact name
-        if not post.get('name'):
-            post['name'] = post.get('contact_name')
-            
-        post['user_id'] = False
-
         try:
             post['channel_id'] = request.registry['ir.model.data'].get_object_reference(request.cr, SUPERUSER_ID, 'crm', 'crm_case_channel_website')[1]
         except ValueError:
diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index 2db874cf5b7..0a677517646 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -83,7 +83,6 @@ class website_event(website_event):
 
     def _add_event(self, event_name="New Event", context={}, **kwargs):
         try:
-            print kwargs
             dummy, res_id = request.registry.get('ir.model.data').get_object_reference(request.cr, request.uid, 'event_sale', 'product_product_event')
             context['default_event_ticket_ids'] = [[0,0,{
                 'name': _('Subscription'),