Merge pull request #41 from loechel/master

Fix case when theme is provided via an remote https source

.gitignore

@@ -6,6 +6,7 @@ dist
 *.pyc
 *.pyo
 *.egg-info
+.eggs/
 .installed.cfg
 .tox
 include

docs/CHANGES.txt

@@ -5,6 +5,8 @@ Changelog
 ------------------
 
 - Nothing changed yet.
+* Fixed issue with remote themes via https connections
+  [loechel]
 
 
 1.1.1 (2015-03-21)

lib/diazo/rules.py

@@ -9,6 +9,7 @@
 from lxml import etree
 from six import string_types
 from future.moves.urllib.parse import urljoin
+from future.moves.urllib.request import urlopen
 from diazo.cssrules import convert_css_selectors
 from diazo.utils import namespaces, fullname, pkg_xsl, _createOptionParser
 
@@ -115,10 +116,16 @@ def expand_themes(rules_doc, parser=None, absolute_prefix=None,
     for element in rules_doc.xpath('//diazo:theme[@href]',
                                    namespaces=namespaces):
         url = urljoin(base, element.get('href'))
-        if not read_network and url[:6] in ('ftp://', 'http:/', 'https:'):
+        if not read_network and \
+                url.startswith(('ftp://', 'ftps://', 'http://', 'https://')):
             raise ValueError("Supplied theme '%s', "
                              "but network access denied." % url)
-        theme_doc = etree.parse(url, parser=parser)
+        elif read_network and \
+                url.startswith(('ftp://', 'ftps://', 'http://', 'https://')):
+            theme = urlopen(url)
+        else:
+            theme = url
+        theme_doc = etree.parse(theme, parser=parser, base_url=url)
         expand_theme(element, theme_doc, absolute_prefix)
     return rules_doc