mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-18 18:27:27 -08:00
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
15 lines
800 B
Diff
15 lines
800 B
Diff
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,
|