mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-03 04:37:06 -08:00
Robin H. Johnson
56bd759df1
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
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From 865a813078c1b447713aeb1f1bb860c441a88365 Mon Sep 17 00:00:00 2001
|
|
From: Jon Salz <jsalz@chromium.org>
|
|
Date: Fri, 20 Apr 2012 02:41:50 +0800
|
|
Subject: [PATCH] Fix importing of nested modules.
|
|
|
|
https://github.com/joshmarshall/jsonrpclib/issues/15
|
|
---
|
|
jsonrpclib/jsonclass.py | 7 +++++++
|
|
1 files changed, 7 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/jsonrpclib/jsonclass.py b/jsonrpclib/jsonclass.py
|
|
index 298c3da..1d86d5f 100644
|
|
--- a/jsonrpclib/jsonclass.py
|
|
+++ b/jsonrpclib/jsonclass.py
|
|
@@ -129,6 +129,13 @@ def load(obj):
|
|
except ImportError:
|
|
raise TranslationError('Could not import %s from module %s.' %
|
|
(json_class_name, json_module_tree))
|
|
+
|
|
+ # The returned class is the top-level module, not the one we really
|
|
+ # want. (E.g., if we import a.b.c, we now have a.) Walk through other
|
|
+ # path components to get to b and c.
|
|
+ for i in json_module_parts[1:]:
|
|
+ temp_module = getattr(temp_module, i)
|
|
+
|
|
json_class = getattr(temp_module, json_class_name)
|
|
# Creating the object...
|
|
new_obj = None
|
|
--
|
|
1.7.3.4
|
|
|