Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/python/python26/patches/Python26-00-filemagic.patch
changeset 841 1a62cefa636d
parent 115 c360825c3a3f 
--- a/components/python/python26/patches/Python26-00-filemagic.patch	Wed May 30 10:46:29 2012 -0700
+++ b/components/python/python26/patches/Python26-00-filemagic.patch	Wed May 30 12:40:14 2012 -0700
@@ -56,7 +56,7 @@
 --- Python-2.6.4/Lib/lib2to3/tests/pytree_idempotency.py.orig	Mon Feb 21 10:46:24 2011
 +++ Python-2.6.4/Lib/lib2to3/tests/pytree_idempotency.py	Mon Feb 21 10:46:24 2011
 @@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
+-#!/usr/bin/env python
 +#!/usr/bin/python2.6
  # Copyright 2006 Google, Inc. All Rights Reserved.
  # Licensed to PSF under a Contributor Agreement.
@@ -64,8 +64,7 @@
 diff -u Python-2.6.4/Lib/lib2to3/tests/test_all_fixers.py.orig Python-2.6.4/Lib/lib2to3/tests/test_all_fixers.py
 --- Python-2.6.4/Lib/lib2to3/tests/test_all_fixers.py.orig	Mon Feb 21 10:46:24 2011
 +++ Python-2.6.4/Lib/lib2to3/tests/test_all_fixers.py	Mon Feb 21 10:46:24 2011
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
+@@ -1,3 +1,4 @@
 +#!/usr/bin/python2.6
  """Tests that run all fixer modules over an input stream.
  
@@ -73,17 +72,15 @@
 diff -u Python-2.6.4/Lib/lib2to3/tests/test_util.py.orig Python-2.6.4/Lib/lib2to3/tests/test_util.py
 --- Python-2.6.4/Lib/lib2to3/tests/test_util.py.orig	Mon Feb 21 10:46:24 2011
 +++ Python-2.6.4/Lib/lib2to3/tests/test_util.py	Mon Feb 21 10:46:24 2011
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
+@@ -1,3 +1,4 @@
 +#!/usr/bin/python2.6
- """ Test suite for the code in fixes.util """
- # Author: Collin Winter
+ """ Test suite for the code in fixer_util """
  
+ # Testing imports
 diff -u Python-2.6.4/Lib/lib2to3/tests/test_parser.py.orig Python-2.6.4/Lib/lib2to3/tests/test_parser.py
 --- Python-2.6.4/Lib/lib2to3/tests/test_parser.py.orig	Mon Feb 21 10:46:24 2011
 +++ Python-2.6.4/Lib/lib2to3/tests/test_parser.py	Mon Feb 21 10:46:24 2011
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
+@@ -1,3 +1,4 @@
 +#!/usr/bin/python2.6
  """Test suite for 2to3's parser and grammar files.
  
@@ -91,8 +88,7 @@
 diff -u Python-2.6.4/Lib/lib2to3/tests/test_pytree.py.orig Python-2.6.4/Lib/lib2to3/tests/test_pytree.py
 --- Python-2.6.4/Lib/lib2to3/tests/test_pytree.py.orig	Mon Feb 21 10:46:24 2011
 +++ Python-2.6.4/Lib/lib2to3/tests/test_pytree.py	Mon Feb 21 10:46:24 2011
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
+@@ -1,3 +1,4 @@
 +#!/usr/bin/python2.6
  # Copyright 2006 Google, Inc. All Rights Reserved.
  # Licensed to PSF under a Contributor Agreement.
@@ -100,8 +96,7 @@
 diff -u Python-2.6.4/Lib/lib2to3/tests/test_fixers.py.orig Python-2.6.4/Lib/lib2to3/tests/test_fixers.py
 --- Python-2.6.4/Lib/lib2to3/tests/test_fixers.py.orig	Mon Feb 21 10:46:24 2011
 +++ Python-2.6.4/Lib/lib2to3/tests/test_fixers.py	Mon Feb 21 10:46:24 2011
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
+@@ -1,3 +1,4 @@
 +#!/usr/bin/python2.6
  """ Test suite for the fixer modules """
  # Author: Collin Winter
@@ -109,8 +104,7 @@
 diff -u Python-2.6.4/Lib/lib2to3/refactor.py.orig Python-2.6.4/Lib/lib2to3/refactor.py
 --- Python-2.6.4/Lib/lib2to3/refactor.py.orig	Mon Feb 21 10:46:24 2011
 +++ Python-2.6.4/Lib/lib2to3/refactor.py	Mon Feb 21 10:46:24 2011
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python2.5
+@@ -1,3 +1,4 @@
 +#!/usr/bin/python2.6
  # Copyright 2006 Google, Inc. All Rights Reserved.
  # Licensed to PSF under a Contributor Agreement.
@@ -494,14 +488,14 @@
     Roger E. Masse
  """
 diff -u Python-2.6.4/Lib/test/test_pep263.py.orig Python-2.6.4/Lib/test/test_pep263.py
---- Python-2.6.4/Lib/test/test_pep263.py.orig	Mon Feb 21 10:46:32 2011
-+++ Python-2.6.4/Lib/test/test_pep263.py	Mon Feb 21 10:46:32 2011
+--- Python-2.6.4/Lib/test/test_pep263.py.orig   Mon Feb 21 10:46:32 2011
++++ Python-2.6.4/Lib/test/test_pep263.py        Mon Feb 21 10:46:32 2011
 @@ -1,4 +1,4 @@
--#! -*- coding: koi8-r -*-
+-# -*- coding: koi8-r -*-
 +#!/usr/bin/python2.6
- # This file is marked as binary in SVN, to prevent MacCVS from recoding it.
- 
- import unittest
+ 
+ import unittest
+ from test import test_support
 diff -u Python-2.6.4/Lib/test/test_anydbm.py.orig Python-2.6.4/Lib/test/test_anydbm.py
 --- Python-2.6.4/Lib/test/test_anydbm.py.orig	Mon Feb 21 10:46:35 2011
 +++ Python-2.6.4/Lib/test/test_anydbm.py	Mon Feb 21 10:46:35 2011
@@ -2230,3 +2224,19 @@
  # -*- coding: utf-8 -*-
  
  # Check for stylistic and formal issues in .rst and .py
+--- Python-2.6.8/Lib/lib2to3/tests/data/different_encoding.py.orig	2012-05-11 08:48:22.819694540 -0700
++++ Python-2.6.8/Lib/lib2to3/tests/data/different_encoding.py	2012-05-11 08:48:38.042397815 -0700
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python2.6
+ # -*- coding: utf-8 -*-
+ print u'ßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞ'
+ 
+--- Python-2.6.8/Lib/whichdb.py.orig	2012-05-11 08:51:07.506663732 -0700
++++ Python-2.6.8/Lib/whichdb.py	2012-05-11 08:51:22.897281496 -0700
+@@ -1,4 +1,4 @@
+-# !/usr/bin/env python
++#!/usr/bin/python2.6
+ """Guess which db package to use to open a db file."""
+ 
+ import os
upstream/oracle/userland-gate