From 4dad82a0527192c0d46d9995b8691b499b2f38e5 Mon Sep 17 00:00:00 2001 From: Kevin Modzelewski Date: Fri, 4 Sep 2015 10:45:27 +0000 Subject: [PATCH] Last few fixes to make sqlalchemy_declarative work --- minibenchmarks/sqlalchemy_declarative.py | 2 +- src/runtime/set.cpp | 3 +++ test/tests/set.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/minibenchmarks/sqlalchemy_declarative.py b/minibenchmarks/sqlalchemy_declarative.py index 741073b55..af0982cd5 100644 --- a/minibenchmarks/sqlalchemy_declarative.py +++ b/minibenchmarks/sqlalchemy_declarative.py @@ -2,7 +2,7 @@ import os import sys -sys.path.append(os.path.join(os.path.dirname(__file__), "../test/testsuite/lib/sqlalchemy/lib")) +sys.path.append(os.path.join(os.path.dirname(__file__), "../test/lib/sqlalchemy/lib")) from sqlalchemy import Column, ForeignKey, Integer, String from sqlalchemy.ext.declarative import declarative_base diff --git a/src/runtime/set.cpp b/src/runtime/set.cpp index 287296469..01966f6bd 100644 --- a/src/runtime/set.cpp +++ b/src/runtime/set.cpp @@ -659,8 +659,11 @@ void setupSet() { set_cls->giveAttr("difference_update", new BoxedFunction(boxRTFunction((void*)setDifferenceUpdate, UNKNOWN, 1, 0, true, false))); set_cls->giveAttr("issubset", new BoxedFunction(boxRTFunction((void*)setIssubset, UNKNOWN, 2))); + frozenset_cls->giveAttr("issubset", set_cls->getattr(internStringMortal("issubset"))); set_cls->giveAttr("issuperset", new BoxedFunction(boxRTFunction((void*)setIssuperset, UNKNOWN, 2))); + frozenset_cls->giveAttr("issuperset", set_cls->getattr(internStringMortal("issuperset"))); set_cls->giveAttr("isdisjoint", new BoxedFunction(boxRTFunction((void*)setIsdisjoint, UNKNOWN, 2))); + frozenset_cls->giveAttr("isdisjoint", set_cls->getattr(internStringMortal("isdisjoint"))); set_cls->giveAttr("copy", new BoxedFunction(boxRTFunction((void*)setCopy, UNKNOWN, 1))); set_cls->giveAttr("pop", new BoxedFunction(boxRTFunction((void*)setPop, UNKNOWN, 1))); diff --git a/test/tests/set.py b/test/tests/set.py index 013090077..6d08f9865 100644 --- a/test/tests/set.py +++ b/test/tests/set.py @@ -128,7 +128,7 @@ class MyFrozenset(frozenset): for s1 in set(range(5)), frozenset(range(5)): for s2 in compare_to: - print type(s2), sorted(s2), s.issubset(s2), s.issuperset(s2), s == s2, s != s2, sorted(s.difference(s2)), s.isdisjoint(s2), sorted(s1.union(s2)), sorted(s1.intersection(s2)) + print type(s2), sorted(s2), s1.issubset(s2), s1.issuperset(s2), s1 == s2, s1 != s2, sorted(s1.difference(s2)), s1.isdisjoint(s2), sorted(s1.union(s2)), sorted(s1.intersection(s2)) f = float('nan') s = set([f])