From 67a08ff4d27efacefc5a16505142ac0b27b2b3b5 Mon Sep 17 00:00:00 2001
From: Marco Biasini <marco.biasini@unibas.ch>
Date: Wed, 8 May 2013 11:39:03 +0200
Subject: [PATCH] fix BZDNG-449
---
modules/io/pymod/__init__.py | 8 +++-----
modules/io/pymod/remote.py | 5 ++++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/modules/io/pymod/__init__.py b/modules/io/pymod/__init__.py
index 7cf8437f7..4d6018fa0 100644
--- a/modules/io/pymod/__init__.py
+++ b/modules/io/pymod/__init__.py
@@ -300,11 +300,9 @@ def LoadMMCIF(filename, restrict_chains="", fault_tolerant=None, calpha_only=Non
prof.fault_tolerant=_override(prof.fault_tolerant, fault_tolerant)
if remote:
- output_dir = tempfile.gettempdir()
- if __GetModelFromPDB(filename, output_dir):
- filename = os.path.join(output_dir, 'pdb%s.ent.gz' % filename)
- else:
- raise IOError('Can not load PDB %s from www.pdb.org'%filename)
+ from ost.io.remote import RemoteGet
+ tmp_file =RemoteGet(filename, from_repo='cif')
+ filename = tmp_file.name
conop_inst = conop.Conopology.Instance()
builder = conop_inst.GetBuilder("DEFAULT")
diff --git a/modules/io/pymod/remote.py b/modules/io/pymod/remote.py
index 102cf6807..aeb9bee05 100644
--- a/modules/io/pymod/remote.py
+++ b/modules/io/pymod/remote.py
@@ -50,7 +50,10 @@ class RemoteRepository:
try:
connection = urllib2.urlopen(remote_url)
- status = connection.getcode()
+ if hasattr(connection, 'code'):
+ status = connection.code
+ else:
+ status = connection.getcode()
except urllib2.HTTPError, e:
status = e.code
msg = 'Could not load %s from %s (status code %d)'
--
GitLab