[javascriptlint-commit] SF.net SVN: javascriptlint:[329] trunk
Status: Beta
Brought to you by:
matthiasmiller
Menu
▾
▴
[javascriptlint-commit] SF.net SVN: javascriptlint:[329] trunk
|
From: <mat...@us...> - 2013-10-02 23:27:22
|
Revision: 329
http://sourceforge.net/p/javascriptlint/code/329
Author: matthiasmiller
Date: 2013-10-02 23:27:18 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
pylint: fix more whitespace issues
Modified Paths:
--------------
trunk/javascriptlint/jsparse.py
trunk/javascriptlint/warnings.py
trunk/jsengine/parser/__init__.py
trunk/jsengine/structs.py
trunk/test.py
trunk/www.py
Modified: trunk/javascriptlint/jsparse.py
===================================================================
--- trunk/javascriptlint/jsparse.py 2013-10-02 23:23:24 UTC (rev 328)
+++ trunk/javascriptlint/jsparse.py 2013-10-02 23:27:18 UTC (rev 329)
@@ -55,7 +55,7 @@
""" All node positions will be relative to startpos. This allows scripts
to be embedded in a file (for example, HTML).
"""
- startpos = startpos or NodePos(0,0)
+ startpos = startpos or NodePos(0, 0)
jsversion = jsversion or JSVersion.default()
assert isvalidversion(jsversion), jsversion
if jsversion.e4x:
@@ -173,7 +173,7 @@
self.assertEquals(pos.to_offset(NodePos(1, 0)), 5)
self.assertEquals(pos.to_offset(NodePos(3, 1)), 11)
def testStartPos(self):
- pos = NodePositions('abc\r\ndef\n\nghi', NodePos(3,4))
+ pos = NodePositions('abc\r\ndef\n\nghi', NodePos(3, 4))
self.assertEquals(pos.to_offset(NodePos(3, 4)), 0)
self.assertEquals(pos.to_offset(NodePos(3, 5)), 1)
self.assertEquals(pos.from_offset(0), NodePos(3, 4))
@@ -185,21 +185,21 @@
def testAdd(self):
r = NodeRanges()
r.add(5, 10)
- self.assertEquals(r._offsets, [5,11])
+ self.assertEquals(r._offsets, [5, 11])
r.add(15, 20)
- self.assertEquals(r._offsets, [5,11,15,21])
- r.add(21,22)
- self.assertEquals(r._offsets, [5,11,15,23])
- r.add(4,5)
- self.assertEquals(r._offsets, [4,11,15,23])
- r.add(9,11)
- self.assertEquals(r._offsets, [4,12,15,23])
- r.add(10,20)
- self.assertEquals(r._offsets, [4,23])
- r.add(4,22)
- self.assertEquals(r._offsets, [4,23])
- r.add(30,30)
- self.assertEquals(r._offsets, [4,23,30,31])
+ self.assertEquals(r._offsets, [5, 11, 15, 21])
+ r.add(21, 22)
+ self.assertEquals(r._offsets, [5, 11, 15, 23])
+ r.add(4, 5)
+ self.assertEquals(r._offsets, [4, 11, 15, 23])
+ r.add(9, 11)
+ self.assertEquals(r._offsets, [4, 12, 15, 23])
+ r.add(10, 20)
+ self.assertEquals(r._offsets, [4, 23])
+ r.add(4, 22)
+ self.assertEquals(r._offsets, [4, 23])
+ r.add(30, 30)
+ self.assertEquals(r._offsets, [4, 23, 30, 31])
def testHas(self):
r = NodeRanges()
r.add(5, 10)
@@ -239,8 +239,8 @@
return errors[0]
self.assertEquals(geterror(' ?', None), (0, 1, 'syntax_error', {}))
self.assertEquals(geterror('\n ?', None), (1, 1, 'syntax_error', {}))
- self.assertEquals(geterror(' ?', NodePos(1,1)), (1, 2, 'syntax_error', {}))
- self.assertEquals(geterror('\n ?', NodePos(1,1)), (2, 1, 'syntax_error', {}))
+ self.assertEquals(geterror(' ?', NodePos(1, 1)), (1, 2, 'syntax_error', {}))
+ self.assertEquals(geterror('\n ?', NodePos(1, 1)), (2, 1, 'syntax_error', {}))
def testNodePos(self):
def getnodepos(script, startpos):
root = parse(script, None, None, startpos)
@@ -248,24 +248,24 @@
var, = root.kids
self.assertEquals(var.kind, tok.VAR)
return var.start_pos()
- self.assertEquals(getnodepos('var x;', None), NodePos(0,0))
- self.assertEquals(getnodepos(' var x;', None), NodePos(0,1))
- self.assertEquals(getnodepos('\n\n var x;', None), NodePos(2,1))
- self.assertEquals(getnodepos('var x;', NodePos(3,4)), NodePos(3,4))
- self.assertEquals(getnodepos(' var x;', NodePos(3,4)), NodePos(3,5))
- self.assertEquals(getnodepos('\n\n var x;', NodePos(3,4)), NodePos(5,1))
+ self.assertEquals(getnodepos('var x;', None), NodePos(0, 0))
+ self.assertEquals(getnodepos(' var x;', None), NodePos(0, 1))
+ self.assertEquals(getnodepos('\n\n var x;', None), NodePos(2, 1))
+ self.assertEquals(getnodepos('var x;', NodePos(3, 4)), NodePos(3, 4))
+ self.assertEquals(getnodepos(' var x;', NodePos(3, 4)), NodePos(3, 5))
+ self.assertEquals(getnodepos('\n\n var x;', NodePos(3, 4)), NodePos(5, 1))
def testComments(self):
def testcomment(comment, startpos, expectedpos):
root = parse(comment, None, None, startpos)
comment, = findcomments(comment, root, startpos)
self.assertEquals(comment.start_pos(), expectedpos)
for comment in ('/*comment*/', '//comment'):
- testcomment(comment, None, NodePos(0,0))
- testcomment(' %s' % comment, None, NodePos(0,1))
- testcomment('\n\n %s' % comment, None, NodePos(2,1))
- testcomment('%s' % comment, NodePos(3,4), NodePos(3,4))
- testcomment(' %s' % comment, NodePos(3,4), NodePos(3,5))
- testcomment('\n\n %s' % comment, NodePos(3,4), NodePos(5,1))
+ testcomment(comment, None, NodePos(0, 0))
+ testcomment(' %s' % comment, None, NodePos(0, 1))
+ testcomment('\n\n %s' % comment, None, NodePos(2, 1))
+ testcomment('%s' % comment, NodePos(3, 4), NodePos(3, 4))
+ testcomment(' %s' % comment, NodePos(3, 4), NodePos(3, 5))
+ testcomment('\n\n %s' % comment, NodePos(3, 4), NodePos(5, 1))
if __name__ == '__main__':
unittest.main()
Modified: trunk/javascriptlint/warnings.py
===================================================================
--- trunk/javascriptlint/warnings.py 2013-10-02 23:23:24 UTC (rev 328)
+++ trunk/javascriptlint/warnings.py 2013-10-02 23:27:18 UTC (rev 329)
@@ -290,7 +290,7 @@
def with_statement(node):
raise LintWarning(node)
-@lookfor(tok.EQOP,tok.RELOP)
+@lookfor(tok.EQOP, tok.RELOP)
def useless_comparison(node):
for lvalue, rvalue in itertools.combinations(node.kids, 2):
if lvalue.is_equivalent(rvalue):
Modified: trunk/jsengine/parser/__init__.py
===================================================================
--- trunk/jsengine/parser/__init__.py 2013-10-02 23:23:24 UTC (rev 328)
+++ trunk/jsengine/parser/__init__.py 2013-10-02 23:27:18 UTC (rev 329)
@@ -854,7 +854,7 @@
try:
parsestring('/*')
except JSSyntaxError as error:
- self.assertEqual(error.pos, NodePos(0,1))
+ self.assertEqual(error.pos, NodePos(0, 1))
else:
self.assert_(False)
def testObjectEndComma(self):
Modified: trunk/jsengine/structs.py
===================================================================
--- trunk/jsengine/structs.py 2013-10-02 23:23:24 UTC (rev 328)
+++ trunk/jsengine/structs.py 2013-10-02 23:27:18 UTC (rev 329)
@@ -63,7 +63,7 @@
end = self._offsets[j]
j += 1
- self._offsets[i:j] = [start,end]
+ self._offsets[i:j] = [start, end]
def has(self, pos):
return bisect.bisect_right(self._offsets, pos) % 2 == 1
Modified: trunk/test.py
===================================================================
--- trunk/test.py 2013-10-02 23:23:24 UTC (rev 328)
+++ trunk/test.py 2013-10-02 23:27:18 UTC (rev 329)
@@ -130,8 +130,6 @@
'C0202', # Class method should have "cls" as first argument
'C0301', # Line too long (%s/%s)
'C0321', # More than one statement on a single line
- 'C0323', # Operator not followed by a space
- 'C0324', # Comma not followed by a space
'C1001', # Old style class
'E0602', # Undefined variable %r
'E1101', # %s %r has no %r member
Modified: trunk/www.py
===================================================================
--- trunk/www.py 2013-10-02 23:23:24 UTC (rev 328)
+++ trunk/www.py 2013-10-02 23:27:18 UTC (rev 329)
@@ -361,12 +361,12 @@
if action == 'build':
build(host)
return
- print >>sys.stderr, """\
+ sys.stderr.write("""\
Usage: www.py [server|build] <host>
server runs a test server on localhost
build generates static HTML files from the markup
-"""
+""")
sys.exit(1)
if __name__ == '__main__':
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
