[Pcsclite-cvs-commit] r5687 - /website/matrix.py

[rousseau at users.alioth.debian.org]

Author: rousseau
Date: Fri Apr  1 15:41:55 2011
New Revision: 5687

URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5687
Log:
Convert to html only when writting the table. templayer already does the
convertion to html codes for & and "

Modified:
    website/matrix.py

Modified: website/matrix.py
URL: http://svn.debian.org/wsvn/pcsclite/website/matrix.py?rev=5687&op=diff
==============================================================================
--- website/matrix.py (original)
+++ website/matrix.py Fri Apr  1 15:41:55 2011
@@ -118,14 +118,13 @@
     readers = parse_all(path, reader_list)
     for r in readers.keys():
         readers[r]['section'] = section
-        readers[r]['iManufacturer'] = html_escape(readers[r]['iManufacturer'])
 
         for o in config.options(r):
             if o == 'features':
                 # for the features we use a list
                 readers[r][o].append(config.get(r, o))
             else:
-                readers[r][o] = html_escape(config.get(r, o))
+                readers[r][o] = config.get(r, o)
 
         bPINSupport = int(readers[r]['bPINSupport'], 16)
         if bPINSupport & 1:
@@ -426,7 +425,7 @@
         elif f == 'features':
             file_desc.write("<td>%s</td>" % ", ".join(reader[f]))
         else:
-            file_desc.write("<td>%s</td>" % reader.get(f, ""))
+            file_desc.write("<td>%s</td>" % html_escape(reader.get(f, "")))
     file_desc.write('</tr>\n')