Revision: 2619
Author: janne.t.harkonen
Date: Fri Mar 12 04:32:38 2010
Log: whitespace
http://code.google.com/p/robotframework/source/detail?r=2619
Modified:
/trunk/src/robot/parsing/htmlreader.py
/trunk/utest/parsing/test_htmlreader.py
=======================================
--- /trunk/src/robot/parsing/htmlreader.py Sun Apr 19 13:26:54 2009
+++ /trunk/src/robot/parsing/htmlreader.py Fri Mar 12 04:32:38 2010
@@ -27,7 +27,7 @@
IGNORE = 0
INITIAL = 1
PROCESS = 2
-
+
def __init__(self):
HTMLParser.HTMLParser.__init__(self)
self._encoding = 'ISO-8859-1'
@@ -41,7 +41,7 @@
'th_end' : self.td_end,
'br_start' : self.br_start,
'meta_start' : self.meta_start }
-
+
def read(self, htmlfile, rawdata):
self.data = rawdata
self.state = self.IGNORE
@@ -57,12 +57,12 @@
def handle_starttag(self, tag, attrs):
handler = self._handlers.get(tag+'_start')
- if handler is not None:
+ if handler is not None:
handler(attrs)
def handle_endtag(self, tag):
handler = self._handlers.get(tag+'_end')
- if handler is not None:
+ if handler is not None:
handler()
def handle_data(self, data, decode=True):
@@ -71,7 +71,7 @@
if decode:
data = data.decode(self._encoding)
self.current_cell.append(data)
-
+
def handle_entityref(self, name):
value = self._handle_entityref(name)
self.handle_data(value, decode=False)
@@ -98,7 +98,7 @@
encoding = self._get_encoding_from_pi(data)
if encoding:
self._encoding = encoding
-
+
def unknown_decl(self, data):
# Ignore everything even if it's invalid. This kind of stuff comes
# at least from MS Excel
@@ -108,7 +108,7 @@
self.state = self.INITIAL
self.current_row = None
self.current_cell = None
-
+
def table_end(self):
if self.current_row is not None:
self.tr_end()
@@ -118,7 +118,7 @@
if self.current_row is not None:
self.tr_end()
self.current_row = []
-
+
def tr_end(self):
if self.current_row is None:
return
@@ -149,7 +149,7 @@
cell = ''.join(self.current_cell)
self.current_row.append(cell)
self.current_cell = None
-
+
def br_start(self, attrs=None):
if self.current_cell is not None and self.state != self.IGNORE:
self.current_cell.append('\n')
@@ -172,7 +172,7 @@
if token.lower().startswith('charset='):
encoding = token[8:]
return valid_http_equiv and encoding or None
-
+
def _get_encoding_from_pi(self, data):
data = data.strip()
if not data.lower().startswith('xml '):
@@ -188,7 +188,7 @@
return None
-# Workaround for following bug in Python 2.6:
http://bugs.python.org/issue3932
+# Workaround for following bug in Python 2.6:
http://bugs.python.org/issue3932
if utils.py_version > (2, 5):
def unescape_from_py25(self, s):
if '&' not in s:
=======================================
--- /trunk/utest/parsing/test_htmlreader.py Sat Feb 28 12:52:58 2009
+++ /trunk/utest/parsing/test_htmlreader.py Fri Mar 12 04:32:38 2010
@@ -11,11 +11,11 @@
class TestDataMock:
-
+
def __init__(self):
self.tables = {}
self.current = None
-
+
def start_table(self, name):
if name in VALID_TABLES:
self.tables[name] = []
@@ -24,22 +24,22 @@
else:
self.current = None
return False
-
+
def add_row(self, cells):
self.tables[self.current].append(cells)
-
+
class TestHtmlReader(unittest.TestCase):
def setUp(self):
self.reader = HtmlReader()
self.reader.data = TestDataMock()
-
+
def test_initial_state(self):
self.reader.state = self.reader.IGNORE
self.reader.feed('<table>')
assert_equals(self.reader.state, self.reader.INITIAL)
- self.reader.feed('</table>')
+ self.reader.feed('</table>')
assert_equals(self.reader.state, self.reader.IGNORE)
def test_start_valid_table(self):
@@ -48,7 +48,7 @@
self.reader.feed(ROW_TEMPLATE % (name, 'Value 1', 'Value2'))
assert_equals(self.reader.state, self.reader.PROCESS)
assert_equals(self.reader.data.current, name)
- self.reader.feed('</table>')
+ self.reader.feed('</table>')
assert_equals(self.reader.state, self.reader.IGNORE)
def test_process_invalid_table(self):
@@ -60,8 +60,8 @@
self.reader.feed(ROW_TEMPLATE % ('This', 'row', 'is ignored'))
assert_equals(self.reader.state, self.reader.IGNORE)
assert_equals(len(self.reader.data.tables.values()), 0)
- self.reader.feed('</table>')
- assert_equals(self.reader.state, self.reader.IGNORE)
+ self.reader.feed('</table>')
+ assert_equals(self.reader.state, self.reader.IGNORE)
def test_br(self):
inp = ('x<br>y', '1<br />2', '<br><br>')
@@ -72,7 +72,7 @@
self.reader.feed(ROW_TEMPLATE % inp)
self.reader.feed('</table>')
assert_equals(self.reader.data.tables[name], [ exp ])
-
+
def test_processing(self):
self._row_processing(ROW_TEMPLATE)
@@ -93,13 +93,13 @@
for name in VALID_TABLES:
self.reader.feed('<table>')
self.reader.feed(row_template % (name, 'Value 1', 'Value2'))
- row_data = [ ['Just', 'some', 'data'],
+ row_data = [ ['Just', 'some', 'data'],
['here', '', 'for'],
['', 'these', 'rows'] ]
for data in row_data:
self.reader.feed(row_template % tuple(data))
assert_equals(self.reader.state, self.reader.PROCESS)
- self.reader.feed('</table>')
+ self.reader.feed('</table>')
assert_equals(self.reader.state, self.reader.IGNORE)
assert_equals(self.reader.data.tables[name], row_data)
@@ -112,7 +112,7 @@
def _handle_response(self, value, decode):
self.response = value
-
+
def test_handle_entiryrefs(self):
for inp, exp in [ ('nbsp', ' '),
('apos', "'"),
@@ -146,7 +146,7 @@
class TestEncoding(unittest.TestCase):
-
+
def test_default_encoding(self):
assert_equals(HtmlReader()._encoding, 'ISO-8859-1')
@@ -156,7 +156,7 @@
assert_equals(reader._encoding, 'utf-8')
reader.feed('<meta http-equiv="Content-Type" content="text/html;
charset=UTF-8">')
assert_equals(reader._encoding, 'UTF-8')
-
+
def test_valid_http_equiv_is_required(self):
reader = HtmlReader()
reader.feed('<meta content="text/html; charset=utf-8" />')
@@ -180,7 +180,7 @@
assert_equals(reader.current_cell, [u'\xe4', u'iti'])
reader.feed('</tr>')
assert_equals(reader.data.tables['Setting'][0], [u'\xe4iti'])
-
-
+
+
if __name__ == '__main__':
unittest.main()
