r18902 - in /branches/frame_order_testing: ./ generic_fns/structure/geometric.py generic_fns/structure/internal.py version.py -- March 20, 2013 - 09:45

Author: bugman
Date: Wed Mar 20 09:45:33 2013
New Revision: 18902

URL: http://svn.gna.org/viewcvs/relax?rev=18902&view=rev
Log:
Merged revisions 18899-18901 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18899 | bugman | 2013-03-19 18:35:18 +0100 (Tue, 19 Mar 2013) | 3 lines
  
  Removed some debugging printouts.
........
  r18900 | bugman | 2013-03-19 18:38:51 +0100 (Tue, 19 Mar 2013) | 3 lines
  
  Python 3 fix for an import into the generic_fns.structure.internal module.
........
  r18901 | bugman | 2013-03-19 18:47:40 +0100 (Tue, 19 Mar 2013) | 6 lines
  
  Python 3 fixes for the relax version information for code checked out from 
the relax repository.
  
  The subversion version.revision() and version.url() functions now handle 
the Python 3 issue of Popen
  working with byte arrays instead of normal strings.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/generic_fns/structure/geometric.py
    branches/frame_order_testing/generic_fns/structure/internal.py
    branches/frame_order_testing/version.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 20 09:45:33 2013
@@ -1,1 +1,1 @@
-/trunk:1-18897
+/trunk:1-18901

Modified: branches/frame_order_testing/generic_fns/structure/geometric.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/geometric.py?rev=18902&r1=18901&r2=18902&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/geometric.py (original)
+++ branches/frame_order_testing/generic_fns/structure/geometric.py Wed Mar 
20 09:45:33 2013
@@ -707,8 +707,6 @@
     blades[1] = blades[1] / norm(blades[1])
     blades[2] = -blades[0]
     blades[3] = -blades[1]
-    print axis
-    print blades
 
     # Create the 4 blades.
     for i in range(len(blades)):

Modified: branches/frame_order_testing/generic_fns/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/structure/internal.py?rev=18902&r1=18901&r2=18902&view=diff
==============================================================================
--- branches/frame_order_testing/generic_fns/structure/internal.py (original)
+++ branches/frame_order_testing/generic_fns/structure/internal.py Wed Mar 20 
09:45:33 2013
@@ -28,7 +28,7 @@
 import os
 from os import F_OK, access, curdir, sep
 from os.path import abspath
-from string import digits, uppercase
+from string import digits, ascii_uppercase
 from warnings import warn
 
 # relax module imports.
@@ -678,7 +678,7 @@
 
         # Convert to the molecule index.
         if chain_id:
-            mol_index = uppercase.index(chain_id)
+            mol_index = ascii_uppercase.index(chain_id)
 
         # Return the index.
         return mol_index

Modified: branches/frame_order_testing/version.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/version.py?rev=18902&r1=18901&r2=18902&view=diff
==============================================================================
--- branches/frame_order_testing/version.py (original)
+++ branches/frame_order_testing/version.py Wed Mar 20 09:45:33 2013
@@ -62,6 +62,10 @@
 
     # Loop over the output lines.
     for line in pipe.stdout.readlines():
+        # Decode Python 3 byte arrays.
+        if hasattr(line, 'decode'):
+            line = line.decode()
+
         # Split up the line.
         row = line.split()
 
@@ -94,6 +98,10 @@
 
     # Loop over the output lines.
     for line in pipe.stdout.readlines():
+        # Decode Python 3 byte arrays.
+        if hasattr(line, 'decode'):
+            line = line.decode()
+
         # Split up the line.
         row = line.split()