Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Incorrectly using a non-generic type with type parameters now produces a helpful Python error instead of throwing NullReferenceException#1326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
lostmsu merged 4 commits intopythonnet:masterfromtminka:generics-exception
Dec 18, 2020
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletionsAUTHORS.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,6 +60,7 @@
- Sean Freitag ([@cowboygneox](https://github.com/cowboygneox))
- Serge Weinstock ([@sweinst](https://github.com/sweinst))
- Simon Mourier ([@smourier](https://github.com/smourier))
- Tom Minka ([@tminka](https://github.com/tminka))
- Viktoria Kovescses ([@vkovec](https://github.com/vkovec))
- Ville M. Vainio ([@vivainio](https://github.com/vivainio))
- Virgil Dupras ([@hsoft](https://github.com/hsoft))
Expand Down
1 change: 1 addition & 0 deletionsCHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,6 +42,7 @@ details about the cause of the failure
- Made it possible to use `__len__` also on `ICollection<>` interface objects
- Made it possible to call `ToString`, `GetHashCode`, and `GetType` on inteface objects
- Fixed objects returned by enumerating `PyObject` being disposed too soon
- Incorrectly using a non-generic type with type parameters now produces a helpful Python error instead of throwing NullReferenceException

### Removed

Expand Down
2 changes: 1 addition & 1 deletionsrc/runtime/classbase.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ public virtual IntPtr type_subscript(IntPtr idx)
return c.pyHandle;
}

return Exceptions.RaiseTypeError("notype matches params");
return Exceptions.RaiseTypeError($"{type.Namespace}.{type.Name} does not accept {types.Length} generic parameters");
}

/// <summary>
Expand Down
99 changes: 40 additions & 59 deletionssrc/runtime/genericutil.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,14 +9,13 @@ namespace Python.Runtime
/// This class is responsible for efficiently maintaining the bits
/// of information we need to support aliases with 'nice names'.
/// </summary>
internal class GenericUtil
internalstaticclass GenericUtil
{
/// <summary>
/// Maps namespace -> generic base name -> list of generic type names
/// </summary>
private static Dictionary<string, Dictionary<string, List<string>>> mapping;

private GenericUtil()
{
}

public static void Reset()
{
mapping = new Dictionary<string, Dictionary<string, List<string>>>();
Expand All@@ -25,29 +24,23 @@ public static void Reset()
/// <summary>
/// Register a generic type that appears in a given namespace.
/// </summary>
/// <param name="t">A generic type definition (<c>t.IsGenericTypeDefinition</c> must be true)</param>
internal static void Register(Type t)
{
if (null == t.Namespace || null == t.Name)
{
return;
}

Dictionary<string, List<string>> nsmap = null;
mapping.TryGetValue(t.Namespace, out nsmap);
if (nsmap == null)
Dictionary<string, List<string>> nsmap;
if (!mapping.TryGetValue(t.Namespace, out nsmap))
{
nsmap = new Dictionary<string, List<string>>();
mapping[t.Namespace] = nsmap;
}
string basename = t.Name;
int tick = basename.IndexOf("`");
if (tick > -1)
{
basename = basename.Substring(0, tick);
}
List<string> gnames = null;
nsmap.TryGetValue(basename, out gnames);
if (gnames == null)
string basename = GetBasename(t.Name);
List<string> gnames;
if (!nsmap.TryGetValue(basename, out gnames))
{
gnames = new List<string>();
nsmap[basename] = gnames;
Expand All@@ -60,9 +53,8 @@ internal static void Register(Type t)
/// </summary>
public static List<string> GetGenericBaseNames(string ns)
{
Dictionary<string, List<string>> nsmap = null;
mapping.TryGetValue(ns, out nsmap);
if (nsmap == null)
Dictionary<string, List<string>> nsmap;
if (!mapping.TryGetValue(ns, out nsmap))
{
return null;
}
Expand All@@ -75,84 +67,73 @@ public static List<string> GetGenericBaseNames(string ns)
}

/// <summary>
///xxx
///Finds a generic type with the given number of generic parameters and the same name and namespace as <paramref name="t"/>.
/// </summary>
public static Type GenericForType(Type t, int paramCount)
{
return GenericByName(t.Namespace, t.Name, paramCount);
}

public static Type GenericByName(string ns, string name, int paramCount)
{
foreach (Type t in GenericsByName(ns, name))
{
if (t.GetGenericArguments().Length == paramCount)
{
return t;
}
}
return null;
}

public static List<Type> GenericsForType(Type t)
{
return GenericsByName(t.Namespace, t.Name);
}

public static List<Type> GenericsByName(string ns, string basename)
/// <summary>
/// Finds a generic type in the given namespace with the given name and number of generic parameters.
/// </summary>
public static Type GenericByName(string ns, string basename, int paramCount)
{
Dictionary<string, List<string>> nsmap = null;
mapping.TryGetValue(ns, out nsmap);
if (nsmap == null)
Dictionary<string, List<string>> nsmap;
if (!mapping.TryGetValue(ns, out nsmap))
{
return null;
}

int tick = basename.IndexOf("`");
if (tick > -1)
{
basename = basename.Substring(0, tick);
}

List<string> names = null;
nsmap.TryGetValue(basename, out names);
if (names == null)
List<string> names;
if (!nsmap.TryGetValue(GetBasename(basename), out names))
{
return null;
}

var result = new List<Type>();
foreach (string name in names)
{
string qname = ns + "." + name;
Type o = AssemblyManager.LookupTypes(qname).FirstOrDefault();
if (o != null)
if (o != null && o.GetGenericArguments().Length == paramCount)
{
result.Add(o);
return o;
}
}

returnresult;
returnnull;
}

/// <summary>
/// xxx
/// </summary>
public static string GenericNameForBaseName(string ns, string name)
{
Dictionary<string, List<string>> nsmap = null;
mapping.TryGetValue(ns, out nsmap);
if (nsmap == null)
Dictionary<string, List<string>> nsmap;
if (!mapping.TryGetValue(ns, out nsmap))
{
return null;
}
List<string> gnames = null;
List<string> gnames;
nsmap.TryGetValue(name, out gnames);
if (gnames?.Count > 0)
{
return gnames[0];
}
return null;
}

private static string GetBasename(string name)
{
int tick = name.IndexOf("`");
if (tick > -1)
{
return name.Substring(0, tick);
}
else
{
return name;
}
}
}
}
5 changes: 5 additions & 0 deletionssrc/tests/test_generic.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -745,3 +745,8 @@ def test_nested_generic_class():
"""Check nested generic classes."""
# TODO NotImplemented
pass

def test_missing_generic_type():
from System.Collections import IList
with pytest.raises(TypeError):
IList[bool]
[8]ページ先頭
©2009-2025 Movatter.jp