restore some Python 2.5 compatibility

Author: speleo3

Diff for: anglebetweenhelices.py

@@ -2,7 +2,6 @@
 (c) 2010 Thomas Holder
 '''
 
-from __future__ import print_function
 from pymol import cmd, stored, CmdException
 from chempy import cpv
 import math
@@ -296,10 +295,10 @@ def angle_between_helices(selection1, selection2, method='helix_orientation', vi
     try:
         orientation = methods[str(method)]
     except KeyError:
-        print('no such method:', method)
+        print('no such method: ' + str(method))
         raise CmdException
     if not quiet:
-        print('Using method:', orientation.__name__)
+        print('Using method: ' + orientation.__name__)
     cen1, dir1 = orientation(selection1, visualize, quiet=1)
     cen2, dir2 = orientation(selection2, visualize, quiet=1)
     angle = cpv.get_angle(dir1, dir2)

Diff for: b2transparency.py

@@ -6,7 +6,6 @@
 License: BSD-2-Clause
 '''
 
-from __future__ import print_function
 from pymol import cmd, CmdException
 
 

Diff for: bbPlane.py

@@ -12,7 +12,6 @@
 License: MIT
 '''
 
-from __future__ import print_function
 from pymol import cmd
 
 

Diff for: cgo_arrow.py

@@ -6,7 +6,6 @@
 License: BSD-2-Clause
 '''
 
-from __future__ import print_function
 from pymol import cmd, cgo, CmdException
 
 

Diff for: colorbyrmsd.py

@@ -7,7 +7,6 @@
 License: BSD-2-Clause
 '''
 
-from __future__ import print_function
 from pymol import cmd, CmdException
 
 
@@ -49,7 +48,7 @@ def colorbyrmsd(mobile, target, doAlign=1, doPretty=1, guide=1, method='super',
     try:
         align = cmd.keyword[method][0]
     except:
-        print(' Error: no such method:', method)
+        print(' Error: no such method: ' + str(method))
         raise CmdException
 
     if guide:

Diff for: extra_fit.py

@@ -6,7 +6,6 @@
 License: BSD-2-Clause
 '''
 
-from __future__ import print_function
 __version__ = '1.0'
 
 from pymol import cmd, CmdException
@@ -46,7 +45,7 @@ def extra_fit(selection='(all)', reference=None, method='align', zoom=1,
         if method in cmd.keyword:
             method = cmd.keyword[method][0]
         else:
-            print('Unknown method', method)
+            print('Unknown method ' + str(method))
             raise CmdException
     for model in models:
         x = method(mobile='(%s) and model %s' % (selection, model),

Diff for: findseq.py

@@ -59,7 +59,6 @@
 Jason Vertrees, 2009.
 """
 
-from __future__ import print_function
 from pymol import cmd
 import re
 import types
@@ -375,13 +374,13 @@ def checkParams(needle, haystack, selName, het, firstOnly):
     This is just a helper function for checking the user input
     """
     # check Needle
-    if len(needle) == 0 or type(needle) != bytes:
+    if len(needle) == 0 or not cmd.is_string(needle):
         print("Error: Please provide a string 'needle' to search for.")
         print("Error: For help type 'help motifFinder'.")
         return False
 
     # check Haystack
-    if len(haystack) == 0 or type(haystack) != bytes:
+    if len(haystack) == 0 or not cmd.is_string(haystack):
         print("Error: Please provide valid PyMOL object or selection name")
         print("Error: in which to search.")
         print("Error: For help type 'help motifFinder'.")
@@ -402,7 +401,7 @@ def checkParams(needle, haystack, selName, het, firstOnly):
         return False
 
     # check selName
-    if type(selName) != bytes:
+    if not cmd.is_string(selName):
         print("Error: selName was not a string.")
         return False
     return True

Diff for: flatten_obj.py

@@ -17,7 +17,6 @@
 Version: 1.0
 License: Public Domain
 """
-from __future__ import print_function
 from pymol import cmd, stored
 import re
 try:
@@ -98,7 +97,7 @@ def _int_to_chain(i,base=_default_base):
         if base < 0 or 62 < base:
             raise ValueError("Invalid base")
 
-        quot = int(i)/base
+        quot = int(i)//base
         rem = i%base
         if rem < 26:
             letter = chr( ord("A") + rem)

Diff for: grepset.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from pymol import cmd
 import re
 import pymol.setting

Diff for: renumber.py

@@ -6,8 +6,6 @@
 License: BSD-2-Clause
 '''
 
-from __future__ import print_function
-
 from pymol import cmd, CmdException
 
 

Diff for: show_bumps.py

@@ -6,8 +6,6 @@
 License: BSD-2-Clause
 '''
 
-from __future__ import print_function
-
 from pymol import cmd