fix locus grammar such that it works on py2 and non-macs

Author: alpae

pyoma/browser/locus_parser.py

@@ -16,12 +16,14 @@
 
 grammar = '''?locus : join | complement | complement_join | location
              join  : "join" "(" (complement | location ) ("," (complement | location ))+ ")"
-             complement : "complement" "(" location ")"
+             complement : "complement(" location ")"
              complement_join : "complement" "(" "join" "(" location ("," location)+ ")" ")"
-             location : pos [".." pos ] | "FromElsewhere" "('" _SEQID "'," pos [".." pos] ")" 
+             location : pos [ _RNG pos ] | "FromElsewhere" "('" _SEQID "'," pos [ _RNG pos ] ")" 
              ?pos : num | "Before" "(" num ")" | "After" "(" num ")"
-             ?num : NUMBER      -> number
+             ?num : /[0-9]+/             -> number
              _SEQID: /[A-Za-z0-9._-]+/
+             _RNG: ".."
+             
              
              %import common.NUMBER
              %import common.WS

tests/browser/test_locusparser.py

@@ -1,6 +1,8 @@
 from __future__ import unicode_literals
 import unittest
 from pyoma.browser import locus_parser
+import logging
+logging.basicConfig(level=logging.DEBUG)
 
 
 class LocusParserTest(unittest.TestCase):