Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
More Python3 issues
· 96e7f41a
Andreas Tille
authored
Dec 13, 2019
96e7f41a
Fix some imports
· 78ddf6b6
Andreas Tille
authored
Dec 13, 2019
78ddf6b6
Hide whitespace changes
Inline
Side-by-side
debian/patches/2to3.patch
View file @
78ddf6b6
...
...
@@ -14560,6 +14560,15 @@ Last-Update: Thu, 12 Dec 2019 15:41:47 +0100
class TopologyResidue:
--- a/src/utilities.py
+++ b/src/utilities.py
@@ -53,7 +53,7 @@ import math
import os
from os.path import splitext
import sys
-from aconf import INSTALLDIR, TMPDIR
+from .aconf import INSTALLDIR, TMPDIR
def startLogFile(jobName, fileName, logInput):
with open('%s%s%s/%s' % (INSTALLDIR, TMPDIR, jobName, fileName), 'w') as f:
@@ -173,7 +173,7 @@ def sortDictByValue(inputdict):
Returns
items: The dictionary sorted by value (list)
...
...
@@ -14884,3 +14893,25 @@ Last-Update: Thu, 12 Dec 2019 15:41:47 +0100
PyObject *ModuleDict = PyModule_GetDict(ThisModule);
// for correct handling of Numpy
--- a/pdb2pqr.py.in
+++ b/pdb2pqr.py.in
@@ -58,7 +58,7 @@ __version__ = PDB2PQR_VERSION
if __name__ == "__main__":
""" Determine if called from command line or CGI """
- if not os.environ.has_key("REQUEST_METHOD"):
+ if "REQUEST_METHOD" not in os.environ:
mainCommand(sys.argv)
else:
mainCGI()
--- a/src/server.py
+++ b/src/server.py
@@ -51,7 +51,7 @@ import string
import os
import sys
import time
-from aconf import *
+from .aconf import *
# GLOBAL SERVER VARIABLES
#Currently this file is unused. TODO: Nuke it?