Merge branch 'master' of github.com:hasadna/Open-Knesset

Author: MeirKriheli

Diff for: agendas/views.py

@@ -113,7 +113,6 @@ def get_context_data(self, *args, **kwargs):
             context['mks_bottom'] = map(itemgetter(0),mks_values[-5:])
 
         allAgendaPartyVotes = agenda.get_all_party_values()
-        print allAgendaPartyVotes
         context['agenda_party_values']=dict(map(lambda x:(x[0],x[1]),allAgendaPartyVotes.setdefault(agenda.id,[])))
         context['agendaTopParties']=map(itemgetter(0),sorted(allAgendaPartyVotes[agenda.id],key=itemgetter(1),reverse=True)[:20])
 

Diff for: auxiliary/feeds.py

@@ -37,8 +37,8 @@ def item_description(self, item):
 
     def item_link(self, item):
         target = item.target
-        if not target:
-            print item
+        # if not target:
+        #     print item
         try:
             return getattr(target, 'url')
         except:

Diff for: knesset/feeds.py

@@ -99,5 +99,8 @@ def item_link(self, item):
     def item_pubdate(self, item):
         return item.timestamp
 
+    def item_author_name(self, item):
+        return item.user.get_full_name()
+
 
 

Diff for: laws/templatetags/laws_tags.py

@@ -63,7 +63,7 @@ def member_stand(v, m):
         try:
             return {'stand':stand, 'class':cls, 'name':m.name}
         except Exception, e:
-            print e
+            logging.debug(e,exc_info=True)
             return
 
 @register.inclusion_tag('laws/_paginator.html')

Diff for: mks/feeds.py

@@ -48,8 +48,8 @@ def item_description(self, item):
 
     def item_link(self, item):
         target = item.target
-        if not target:
-            print item
+        # if not target:
+        #     print item
         try:
             return getattr(target, 'url')
         except: