Merge branch 'hotfix/0.22.1'

CHANGELOG.rst

@@ -5,6 +5,12 @@ The following is a summary of changes and improvements to
 :mod:`eulxml`.  New features in each version should be listed, with
 any necessary information about installation or upgrade notes.
 
+0.22.1
+------
+
+* bugfix: workaround for resolver error failing to load schemas in some
+  cases
+
 0.22
 ----
 

eulxml/__init__.py

@@ -14,7 +14,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-__version_info__ = (0, 22, 0, None)
+__version_info__ = (0, 22, 1, None)
 
 # Dot-connect all but the last. Last is dash-connected if not None.
 __version__ = '.'.join([str(i) for i in __version_info__[:-1]])

eulxml/xmlmap/core.py

@@ -578,7 +578,10 @@ def resolve(self, url, public_id, context):
         logger.debug('Resolving url %s' % url)
         f = urllib2.urlopen(url, None, 10)
         # set a timeout in case connection fails or is unreasonably slow
-        return self.resolve_file(f, context, base_url=url)
+        if f:
+            return self.resolve_file(f, context, base_url=url)
+        else:
+            return self.resolve_filename(url, context)
 _defaultResolver = Urllib2Resolver()