Merge pull request #595 from jbarnoud/wrapped2_to3_fix-3

Remove some bangs from formated string
MDAnalysis · Dec 16, 2015 · 256d168 · 256d168
2 parents 47cd54d + 39c969e
commit 256d168
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package/MDAnalysis/analysis/align.py b/package/MDAnalysis/analysis/align.py
@@ -922,7 +922,7 @@ def get_atoms_byres(g, match_mask=np.logical_not(mismatch_mask)):
 
         logger.error("Atoms: reference | trajectory")
         for ar, at in itertools.izip(ag1[mismatch_atomindex], ag2[mismatch_atomindex]):
-            logger.error("{0:4!s} {1:3d} {2:3!s} {3:3!s} {4:6.3f}  |  {5:4!s} {6:3d} {7:3!s} {8:3!s} {9:6.3f}".format(ar.segid, ar.resid, ar.resname, ar.name, ar.mass,
+            logger.error("{0:4s} {1:3d} {2:3s} {3:3s} {4:6.3f}  |  {5:4s} {6:3d} {7:3s} {8:3s} {9:6.3f}".format(ar.segid, ar.resid, ar.resname, ar.name, ar.mass,
                           at.segid, at.resid, at.resname, at.name, at.mass))
         errmsg = ("Inconsistent selections, masses differ by more than {0}; " + \
             "mis-matching atoms are shown above.").format(tol_mass)

diff --git a/package/MDAnalysis/coordinates/XYZ.py b/package/MDAnalysis/coordinates/XYZ.py
@@ -246,7 +246,7 @@ def write_next_timestep(self, ts=None):
         self._xyz.write("{0:d}\n".format(ts.n_atoms))
         self._xyz.write("frame {0}\n".format(ts.frame))
         for atom, (x, y, z) in itertools.izip(self.atomnames, coordinates):
-            self._xyz.write("{0:8!s}  {1:10.5f} {2:10.5f} {3:10.5f}\n".format(atom, x, y, z))
+            self._xyz.write("{0:8s}  {1:10.5f} {2:10.5f} {3:10.5f}\n".format(atom, x, y, z))
 
 
 class XYZReader(base.Reader):