Improve Python 2 compatability with "future" print_function.

Use python3 version of the print function when running
under python2. Also added "from __future__ import division"
to a few more module files.
This commit is contained in:
Matvey Adzhigirey
2012-12-11 16:27:52 -08:00
committed by Mike Beachy
parent 4e7427769e
commit 2079259884
20 changed files with 56 additions and 0 deletions

View File

@@ -1,3 +1,7 @@
from __future__ import division
from __future__ import print_function
import string, Source.lib, Source.group import string, Source.lib, Source.group

View File

@@ -1,4 +1,7 @@
from __future__ import division from __future__ import division
from __future__ import print_function
import pickle,sys,os,math,Source.calculations import pickle,sys,os,math,Source.calculations

View File

@@ -1,5 +1,7 @@
from __future__ import division from __future__ import division
from __future__ import print_function
import math, Source.protonate, Source.bonds,copy, sys import math, Source.protonate, Source.bonds,copy, sys

View File

@@ -3,6 +3,8 @@
# #
from __future__ import division from __future__ import division
from __future__ import print_function
import Source.group, Source.determinants, Source.determinant, Source.ligand, Source.output, Source.coupled_groups, functools import Source.group, Source.determinants, Source.determinant, Source.ligand, Source.output, Source.coupled_groups, functools
class Conformation_container: class Conformation_container:

View File

@@ -1,5 +1,7 @@
from __future__ import division from __future__ import division
from __future__ import print_function
import math, Source.output, Source.group, Source.lib, itertools import math, Source.output, Source.group, Source.lib, itertools

View File

@@ -1,4 +1,7 @@
from __future__ import division
from __future__ import print_function
class Determinant: class Determinant:
""" """
Determinant class - set up for later structurization Determinant class - set up for later structurization

View File

@@ -1,3 +1,7 @@
from __future__ import division
from __future__ import print_function
import math, time import math, time
import Source.iterative, Source.lib, Source.vector_algebra import Source.iterative, Source.lib, Source.vector_algebra

View File

@@ -3,6 +3,8 @@
# #
from __future__ import division from __future__ import division
from __future__ import print_function
import Source.ligand, Source.determinant, Source.ligand_pka_values, math, Source.protonate import Source.ligand, Source.determinant, Source.ligand_pka_values, math, Source.protonate
my_protonator = Source.protonate.Protonate(verbose=False) my_protonator = Source.protonate.Protonate(verbose=False)

View File

@@ -1,3 +1,7 @@
from __future__ import division
from __future__ import print_function
import math, time import math, time
import Source.lib as lib import Source.lib as lib
from Source.determinant import Determinant from Source.determinant import Determinant

View File

@@ -1,5 +1,8 @@
#!/usr/bin/python #!/usr/bin/python
from __future__ import division
from __future__ import print_function
import string, sys, copy, math, os import string, sys, copy, math, os

View File

@@ -1,5 +1,8 @@
#!/usr/bin/python #!/usr/bin/python
from __future__ import division
from __future__ import print_function
import sys, Source.calculations import sys, Source.calculations
from Source.vector_algebra import * from Source.vector_algebra import *

View File

@@ -1,5 +1,8 @@
#!/usr/bin/env python #!/usr/bin/env python
from __future__ import division
from __future__ import print_function
import Source.molecular_container, Source.calculations, Source.calculations, Source.parameters, Source.pdb, Source.lib, os, subprocess, sys import Source.molecular_container, Source.calculations, Source.calculations, Source.parameters, Source.pdb, Source.lib, os, subprocess, sys
class ligand_pka_values: class ligand_pka_values:

View File

@@ -4,6 +4,7 @@
# #
# #
from __future__ import division from __future__ import division
from __future__ import print_function
import os, Source.pdb, sys, Source.version, Source.output, Source.conformation_container, Source.group, Source.lib import os, Source.pdb, sys, Source.version, Source.output, Source.conformation_container, Source.group, Source.lib
class Molecular_container: class Molecular_container:

View File

@@ -1,3 +1,7 @@
from __future__ import division
from __future__ import print_function
import sys import sys
import Source.lib import Source.lib

View File

@@ -1,3 +1,7 @@
from __future__ import division
from __future__ import print_function
import math import math
import Source.lib as lib import Source.lib as lib
import sys, os import sys, os

View File

@@ -1,3 +1,7 @@
from __future__ import division
from __future__ import print_function
import string, sys, copy, Source.lib import string, sys, copy, Source.lib
from Source.atom import Atom from Source.atom import Atom
from Source.conformation_container import Conformation_container from Source.conformation_container import Conformation_container

View File

@@ -1,6 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
from __future__ import division from __future__ import division
from __future__ import print_function
from Source.vector_algebra import * from Source.vector_algebra import *
import Source.bonds, Source.pdb, Source.atom import Source.bonds, Source.pdb, Source.atom

View File

@@ -1,3 +1,5 @@
from __future__ import division
from __future__ import print_function
import math import math
class vector: class vector:

View File

@@ -1,3 +1,5 @@
from __future__ import division
from __future__ import print_function
import math import math
import Source.lib as lib import Source.lib as lib
import sys, os import sys, os

View File

@@ -2,6 +2,9 @@
""" Run test for test pdbs """ """ Run test for test pdbs """
from __future__ import division
from __future__ import print_function
from subprocess import call from subprocess import call
import os, re import os, re
import sys import sys