[med-svn] [Git][med-team/pdb2pqr][master] 2 commits: More Python3 issues

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / pdb2pqr


Commits:
96e7f41a by Andreas Tille at 2019-12-13T16:36:38Z
More Python3 issues

- - - - -
78ddf6b6 by Andreas Tille at 2019-12-13T20:41:48Z
Fix some imports

- - - - -


1 changed file:

- debian/patches/2to3.patch


Changes:

=====================================
debian/patches/2to3.patch
=====================================
@@ -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?



View it on GitLab: https://salsa.debian.org/med-team/pdb2pqr/compare/382cbb2cf752593a6a1315a40ac77c8c556f7a82...78ddf6b666248328f1bcf0dec705fb0960d16515

-- 
View it on GitLab: https://salsa.debian.org/med-team/pdb2pqr/compare/382cbb2cf752593a6a1315a40ac77c8c556f7a82...78ddf6b666248328f1bcf0dec705fb0960d16515
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20191213/5a703433/attachment-0001.html>