diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/bpython/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/bpython/files')
| -rw-r--r-- | dev-python/bpython/files/bpython-0.13-test_repl.patch | 34 | ||||
| -rw-r--r-- | dev-python/bpython/files/bpython-0.14.patch | 14 | ||||
| -rw-r--r-- | dev-python/bpython/files/bpython-desktop.patch | 8 |
3 files changed, 56 insertions, 0 deletions
diff --git a/dev-python/bpython/files/bpython-0.13-test_repl.patch b/dev-python/bpython/files/bpython-0.13-test_repl.patch new file mode 100644 index 000000000000..b71cfbea3440 --- /dev/null +++ b/dev-python/bpython/files/bpython-0.13-test_repl.patch @@ -0,0 +1,34 @@ +https://bitbucket.org/thomasballinger/bpython-for-clean-patch/commits/94c4664c1303 +# HG changeset patch +# User Thomas Ballinger <thomasballinger@gmail.com> +# Date 1404088731 14400 +# Branch 0.13-bugfix +# Node ID 94c4664c130303b1ae53629d6ebcff04f5d5d7ae +# Parent 106c49981f5e2db325d543d24c063f9c38013023 +simplest possible fix for test that changes in py3.3 + +diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py +--- a/bpython/test/test_repl.py ++++ b/bpython/test/test_repl.py +@@ -1,4 +1,5 @@ + import os ++import sys + import unittest + from itertools import islice + from mock import Mock +@@ -280,8 +281,12 @@ + + self.assertTrue(self.repl.complete()) + self.assertTrue(hasattr(self.repl.completer,'matches')) +- self.assertEqual(self.repl.completer.matches, +- ['UnboundLocalError(', '__doc__']) ++ if sys.version_info[0] == 3 and sys.version_info[1] >= 3: ++ self.assertEqual(self.repl.completer.matches, ++ ['ChildProcessError(', 'UnboundLocalError(', '__doc__']) ++ else: ++ self.assertEqual(self.repl.completer.matches, ++ ['UnboundLocalError(', '__doc__']) + + # 2. Attribute tests + def test_simple_attribute_complete(self): + diff --git a/dev-python/bpython/files/bpython-0.14.patch b/dev-python/bpython/files/bpython-0.14.patch new file mode 100644 index 000000000000..00b8e5a420d0 --- /dev/null +++ b/dev-python/bpython/files/bpython-0.14.patch @@ -0,0 +1,14 @@ +diff -r -U2 bpython-0.14.orig/bpython/curtsiesfrontend/repl.py bpython-0.14/bpython/curtsiesfrontend/repl.py +--- bpython-0.14.orig/bpython/curtsiesfrontend/repl.py 2015-02-17 05:07:38.000000000 +0600 ++++ bpython-0.14/bpython/curtsiesfrontend/repl.py 2015-02-19 00:09:13.758932344 +0600 +@@ -420,7 +420,9 @@ + # for reading modules if they fail to load + old_module_locations = {} ++ default_level = 0 if py3 else -1 + + @functools.wraps(self.orig_import) +- def new_import(name, globals={}, locals={}, fromlist=[], level=-1): ++ def new_import(name, globals={}, locals={}, fromlist=[], ++ level=default_level): + try: + m = self.orig_import(name, globals=globals, locals=locals, diff --git a/dev-python/bpython/files/bpython-desktop.patch b/dev-python/bpython/files/bpython-desktop.patch new file mode 100644 index 000000000000..8598679089c9 --- /dev/null +++ b/dev-python/bpython/files/bpython-desktop.patch @@ -0,0 +1,8 @@ +diff -r -U1 bpython-0.11.orig/data/bpython.desktop bpython-0.11/data/bpython.desktop +--- bpython-0.11.orig/data/bpython.desktop 2012-04-05 04:06:42.000000000 +0700 ++++ bpython-0.11/data/bpython.desktop 2012-11-15 17:20:09.000000000 +0700 +@@ -7,3 +7,3 @@ + Type=Application +-Categories=Development;Utility;ConsoleOnly; ++Categories=Development;ConsoleOnly; + StartupNotify=true |
