Merge pull request #3 from tomkralidis/add-logging

replace prints with logging

Author: constantinius

pycql/integrations/sqlalchemy/parser.py

@@ -1,22 +1,27 @@
+
+import logging
+import re
+
 from ...parser import parse as _plain_parse
 from ...util import parse_duration
 from dateparser import parse as parse_datetime
 from sqlalchemy import func
-import re
+
+LOGGER = logging.getLogger(__name__)
 
 
 def parse_geometry(geom):
-    print("PARSE GEOM", geom)
+    LOGGER.debug(f"PARSE GEOM: {geom}")
     search = re.search(r"SRID=(\d+);", geom)
 
     sridtxt = "" if search else "SRID=4326;"
-    print(f"{sridtxt}{geom}")
+    LOGGER.debug(f"{sridtxt}{geom}")
 
     return func.ST_GeomFromEWKT(f"{sridtxt}{geom}")
 
 
 def parse_bbox(box, srid: int=4326):
-    print("PARSE BBOX", type(box), box)
+    LOGGER.debug("PARSE BBOX: {type(box)}, {box}")
     minx, miny, maxx, maxy = box
     return func.ST_GeomFromEWKT(
         f"SRID={srid};POLYGON(("

pycql/lexer.py

@@ -25,12 +25,15 @@
 # THE SOFTWARE.
 # ------------------------------------------------------------------------------
 
+import logging
 
 from ply import lex
 from ply.lex import TOKEN
 
 from . import values
 
+LOGGER = logging.getLogger(__name__)
+
 
 class CQLLexer(object):
     def __init__(self, geometry_factory=values.Geometry, bbox_factory=values.BBox,
@@ -217,4 +220,4 @@ def t_newline(self, t):
     t_ignore = ' \t'
 
     def t_error(self, t):
-        print("ERROR", t)
+        LOGGER.debug(t)

pycql/parser.py

@@ -25,12 +25,16 @@
 # THE SOFTWARE.
 # ------------------------------------------------------------------------------
 
+import logging
+
 from ply import yacc
 
 from .lexer import CQLLexer
 from . import ast
 from . import values
 
+LOGGER = logging.getLogger(__name__)
+
 
 class CQLParser(object):
     def __init__(self, geometry_factory=values.Geometry, bbox_factory=values.BBox,
@@ -260,18 +264,18 @@ def p_empty(self, p):
 
     def p_error(self, p):
         if p:
-            print(dir(p))
-            print("Syntax error at token", p.type, p.value, p.lexpos, p.lineno)
+            LOGGER.debug(dir(p))
+            LOGGER.debug(f"Syntax error at token {p.type}, {p.value}, {p.lexpos}, {p.lineno}")
 
-            print(self.__query.split('\n'))
+            LOGGER.debug(self.__query.split('\n'))
             line = self.__query.split('\n')[p.lineno - 1]
-            print(line)
-            print((' ' * p.lexpos) + '^')
+            LOGGER.debug(line)
+            LOGGER.debug((' ' * p.lexpos) + '^')
 
             # Just discard the token and tell the parser it's okay.
             #p.parser.errok()
         else:
-            print("Syntax error at EOF")
+            LOGGER.debug("Syntax error at EOF")
 
 
 def parse(cql, geometry_factory=values.Geometry, bbox_factory=values.BBox,