Merged from trunk -r12633:12649

   Merged from trunk -r12633:12649

   | 12634   | Bug #230483 - Convert glsa-check option parsing to use the   |
   | zmedico | optparse module. This replaces some code which triggers a    |
   |         | traceback from 2to3. Thanks to Ali Polatel <hawking@g.o> for |
   |         | this patch.                                                  |

   | 12635   | For python-3.0 compatibility, raise a real exception instead |
   | zmedico | of a string.                                                 |

   | 12636   | Inside post_emerge(), skip the vardbapi counter check when   |
   | zmedico | in --pretend mode (significant performance improvement).     |
   |         | Thanks to Marat Radchenko (slonopotamus) for reporting.      |

   | 12637   | Don't bother to calculate PORTAGE_COUNTER_HASH when in       |
   | zmedico | --pretend mode.                                              |

   | 12638   | Use a regular expression for the file.name check. This       |
   | zmedico | replaces some odd map() usage that 2to3 warns about.         |

   | 12639   | For python-3.0 compatibility, don't use string.letters.      |
   | zmedico |                                                              |

   | 12640   | For compatibility with python-3.0, inherit from ObjectProxy  |
   | zmedico | instead of inheriting directly from file.                    |

   | 12641   | For compatibility with python-3.0, always open streams for   |
   | zmedico | pickles in binary mode.                                      |

   | 12642   | For compatibility with python-3.0, open files in text mode   |
   | zmedico | where appropriate.                                           |

   | 12643   | Revert accidental python-3.0 syntax.                         |
   | zmedico |                                                              |

   | 12644   | Tweak code to avoid python-3.0 errors like this one:         |
   | zmedico | SyntaxError: can not delete variable 'e' referenced in       |
   |         | nested scope                                                 |

   | 12645   | For python-3.0 compatibility, encode strings as binary       |
   | zmedico | before trying to pass them to hashlib.                       |

   | 12646   | Tweak exception handling indentation to avoid a bug in 2to3. |
   | zmedico |                                                              |

   | 12647   | Fix update() methods to work with python-3.0.                |
   | zmedico |                                                              |

   | 12648   | Handle ValueError when unpickling, since this can be         |
   | zmedico | triggered by an unsupported pickle protocol.                 |

   | 12649   | Decode terminal codes from binary when necessary, for        |
   | zmedico | python-3.0 compatibility since sys.stdout is a text stream.  |

svn path=/main/branches/prefix/; revision=12652