Commits

Daniel Holth committed bae0ae2 Merge

merge python 2.6 fixes

  • Participants
  • Parent commits 85c2227, 9befec9
  • Tags 0.22.0

Comments (0)

Files changed (6)

wheel/egg2wheel.py

     for pat in args.eggs:
         for egg in iglob(pat):
             if args.verbose:
-                sys.stdout.write("{}... ".format(egg))
+                sys.stdout.write("{0}... ".format(egg))
             egg2wheel(egg, args.dest_dir)
             if args.verbose:
                 sys.stdout.write("OK\n")
 
     def __lt__(self, other):
         if self.context != other.context:
-            raise TypeError("{}.context != {}.context".format(self, other))
+            raise TypeError("{0}.context != {1}.context".format(self, other))
 
         return self._sort_key < other._sort_key
 
             return sv < ov
         # Compatibility
         if self.context != other.context:
-            raise TypeError("{}.context != {}.context".format(self, other))
+            raise TypeError("{0}.context != {1}.context".format(self, other))
         sc = self.rank
         oc = other.rank
         if sc != None and oc != None and sc != oc:
                 # Data file. Target destination is elsewhere
                 key, sep, filename = filename.partition('/')
                 if not sep:
-                    raise ValueError("Invalid filename in wheel: {}".format(name))
+                    raise ValueError("Invalid filename in wheel: {0}".format(name))
                 target = get_path(key)
             else:
                 # Normal file. Target destination is root
                 k = info.filename
                 key, target, filename, dest = v
                 if os.path.exists(dest):
-                    raise ValueError("Wheel file {} would overwrite {}. Use force if this is intended".format(k, dest))
+                    raise ValueError("Wheel file {0} would overwrite {1}. Use force if this is intended".format(k, dest))
 
         # Get the name of our executable, for use when replacing script
         # wrapper hashbang lines.

wheel/metadata.py

File contents unchanged.

wheel/signatures/keys.py

                         self.data['schema'] = self.SCHEMA
                     elif self.data['schema'] != self.SCHEMA:
                         raise ValueError(
-                            "Bad wheel.json version {}, expected {}".format(
+                            "Bad wheel.json version {0}, expected {1}".format(
                                 self.data['schema'], self.SCHEMA))
                 break
         return self

wheel/tool/__init__.py

                 if wf.compatible or force:
                     to_install.append(wf)
                 else:
-                    msg = ("{} is not compatible with this Python. "
+                    msg = ("{0} is not compatible with this Python. "
                            "--force to install anyway.".format(req))
                     raise WheelError(msg)
             else:
 
     for wf in to_install:
         if list_files:
-            sys.stdout.write("    {}\n".format(wf.filename))
+            sys.stdout.write("    {0}\n".format(wf.filename))
             continue
         wf.install(force=force)
         wf.zipfile.close()
             else:
                 conv = bdist_wininst2wheel
             if verbose:
-                sys.stdout.write("{}... ".format(installer))
+                sys.stdout.write("{0}... ".format(installer))
                 sys.stdout.flush()
             conv(installer, dest_dir)
             if verbose:

wheel/wininst2wheel.py

     for pat in args.installers:
         for installer in iglob(pat):
             if args.verbose:
-                sys.stdout.write("{}... ".format(installer))
+                sys.stdout.write("{0}... ".format(installer))
             bdist_wininst2wheel(installer, args.dest_dir)
             if args.verbose:
                 sys.stdout.write("OK\n")