Moved parsing functions starting with stylesheet_declarations() from …

…cascadenik.style to cascadenik.parse

cascadenik/__init__.py

@@ -9,12 +9,14 @@
 from os.path import isdir, realpath, expanduser, dirname, exists
 from urlparse import urlparse
 
-import style
-# compile module
-import compile as _compile
-# compile function
-from compile import compile, Directories
-from style import stylesheet_declarations
+from . import style
+from .parse import stylesheet_declarations
+
+# compile module -> "_compile"
+from . import compile as _compile
+
+# compile function -> "compile"
+from .compile import compile, Directories
 
 # define Cascadenik version
 VERSION = '1.0.0'

cascadenik/compile.py

@@ -54,12 +54,12 @@ def HTTPSConnection(host, port=None, strict=None, timeout=None):
 
 
 # cascadenik
-import safe64
-import style
-import sources
-import style
-import output
-from cascadenik.nonposix import un_posix, to_posix
+from . import safe64
+from . import style
+from . import output
+from . import sources
+from .nonposix import un_posix, to_posix
+from .parse import stylesheet_declarations
 
 # mapnik
 import mapnik
@@ -642,7 +642,7 @@ def extract_declarations(map_el, dirs):
             continue
 
         is_merc = is_merc_projection(map_el.get('srs',''))
-        declarations.extend(style.stylesheet_declarations(styles, is_merc))
+        declarations.extend(stylesheet_declarations(styles, is_merc))
 
     return declarations