pyston · kmod · Feb 13, 2016 · Feb 11, 2016 · Feb 11, 2016 · Feb 12, 2016
diff --git a/from_cpython/CMakeLists.txt b/from_cpython/CMakeLists.txt
@@ -176,6 +176,8 @@ add_custom_command(OUTPUT ${STDMODULES}
 		       Modules/termios.c
 		       Modules/_cursesmodule.c
 		       Modules/mmapmodule.c
+		       Modules/_localemodule.c
+		       Modules/cPickle.c
                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 add_custom_target(sharedmods ALL DEPENDS ${CMAKE_BINARY_DIR}/from_cpython/Lib/_multiprocessing.pyston.so)
 

diff --git a/from_cpython/Include/classobject.h b/from_cpython/Include/classobject.h
@@ -58,6 +58,10 @@ PyAPI_DATA(PyTypeObject*) instancemethod_cls;
 #define PyMethod_Check(op) (Py_TYPE(op) == &PyMethod_Type)
 
 PyAPI_FUNC(PyObject *) PyClass_New(PyObject *, PyObject *, PyObject *) PYSTON_NOEXCEPT;
+
+// Pyston change: pyston addition returns PyClassObject->cl_name
+PyAPI_FUNC(PyObject *) PyClass_Name(PyObject *) PYSTON_NOEXCEPT;
+
 PyAPI_FUNC(PyObject *) PyInstance_New(PyObject *, PyObject *,
                                             PyObject *) PYSTON_NOEXCEPT;
 PyAPI_FUNC(PyObject *) PyInstance_NewRaw(PyObject *, PyObject *) PYSTON_NOEXCEPT;

diff --git a/from_cpython/Include/dictobject.h b/from_cpython/Include/dictobject.h
@@ -110,6 +110,8 @@ PyAPI_DATA(PyTypeObject) PyDictValues_Type;
 
 PyAPI_DATA(PyTypeObject*) dict_cls;
 #define PyDict_Type (*dict_cls)
+PyAPI_DATA(PyTypeObject*) attrwrapper_cls;
+#define PyAttrWrapper_Type (*attrwrapper_cls)
 PyAPI_DATA(PyTypeObject*) dictiterkey_cls;
 #define PyDictIterKey_Type (*dictiterkey_cls)
 PyAPI_DATA(PyTypeObject*) dictitervalue_cls;

diff --git a/from_cpython/Include/methodobject.h b/from_cpython/Include/methodobject.h
@@ -19,6 +19,10 @@ PyAPI_DATA(PyTypeObject*) capifunc_cls;
 
 #define PyCFunction_Check(op) (Py_TYPE(op) == &PyCFunction_Type)
 
+// Pyston change: expose our builtin_function_or_method type
+PyAPI_DATA(PyTypeObject*) builtin_function_or_method_cls;
+#define PyBuiltinFunction_Type (*builtin_function_or_method_cls)
+
 typedef PyObject *(*PyCFunction)(PyObject *, PyObject *);
 typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *,
 					     PyObject *);

diff --git a/from_cpython/Lib/test/pickletester.py b/from_cpython/Lib/test/pickletester.py
@@ -1123,6 +1123,8 @@ def test_incomplete_input(self):
         s = StringIO.StringIO("X''.")
         self.assertRaises(EOFError, self.module.load, s)
 
+    # Pyston change:
+    @unittest.skip("pyston does not support this currently")
     def test_restricted(self):
         # issue7128: cPickle failed in restricted mode
         builtins = {self.module.__name__: self.module,

diff --git a/from_cpython/Lib/test/test__locale.py b/from_cpython/Lib/test/test__locale.py
@@ -1,4 +1,3 @@
-# expected: fail
 from test.test_support import run_unittest
 from _locale import (setlocale, LC_NUMERIC, localeconv, Error)
 try:

diff --git a/from_cpython/Lib/test/test_cookie.py b/from_cpython/Lib/test/test_cookie.py
@@ -1,4 +1,3 @@
-# expected: fail
 # Simple test suite for Cookie.py
 
 from test.test_support import run_unittest, run_doctest, check_warnings

diff --git a/from_cpython/Lib/test/test_cpickle.py b/from_cpython/Lib/test/test_cpickle.py
@@ -1,4 +1,3 @@
-# expected: fail
 import cPickle
 import cStringIO
 import io

diff --git a/from_cpython/Lib/test/test_locale.py b/from_cpython/Lib/test/test_locale.py
@@ -1,4 +1,3 @@
-# expected: fail
 from test.test_support import run_unittest, verbose
 import unittest
 import locale

diff --git a/from_cpython/Lib/test/test_pickle.py b/from_cpython/Lib/test/test_pickle.py
@@ -1,4 +1,3 @@
-# expected: fail
 import pickle
 from cStringIO import StringIO
 

diff --git a/from_cpython/Lib/test/test_pickletools.py b/from_cpython/Lib/test/test_pickletools.py
@@ -1,4 +1,3 @@
-# expected: fail
 import pickle
 import pickletools
 from test import test_support

diff --git a/from_cpython/Lib/test/test_sax.py b/from_cpython/Lib/test/test_sax.py
@@ -1,4 +1,3 @@
-# expected: fail
 # regression test for SAX 2.0            -*- coding: utf-8 -*-
 # $Id$
 

diff --git a/from_cpython/Lib/test/xmltestdata/test.xml.out b/from_cpython/Lib/test/xmltestdata/test.xml.out
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<HTML xmlns:pp="http://www.isogen.com/paul/post-processor">
+<TITLE>Introduction to XSL</TITLE>
+<H1>Introduction to XSL</H1>
+
+
+
+		<HR></HR>
+		<H2>Overview
+</H2>
+		<UL>
+
+	<LI>1.Intro</LI>
+
+	<LI>2.History</LI>
+
+	<LI>3.XSL Basics</LI>
+
+	<LI>Lunch</LI>
+
+	<LI>4.An XML Data Model</LI>
+
+	<LI>5.XSL Patterns</LI>
+
+	<LI>6.XSL Templates</LI>
+
+	<LI>7.XSL Formatting Model
+</LI>
+
+		</UL>
+
+
+
+
+
+
+		<HR></HR>
+		<H2>Intro</H2>
+		<UL>
+
+	<LI>Who am I?</LI>
+
+	<LI>Who are you?</LI>
+
+	<LI>Why are we here?
+</LI>
+
+		</UL>
+
+
+
+
+
+
+		<HR></HR>
+		<H2>History: XML and SGML</H2>
+		<UL>
+
+	<LI>XML is a subset of SGML.</LI>
+
+	<LI>SGML allows the separation of abstract content from formatting.</LI>
+
+	<LI>Also one of XML's primary virtues (in the doc publishing domain).
+</LI>
+
+		</UL>
+
+
+
+
+
+
+		<HR></HR>
+		<H2>History: What are stylesheets?</H2>
+		<UL>
+
+	<LI>Stylesheets specify the formatting of SGML/XML documents.</LI>
+
+	<LI>Stylesheets put the "style" back into documents.</LI>
+
+	<LI>New York Times content+NYT Stylesheet = NYT paper
+</LI>
+
+		</UL>
+
+
+
+
+
+
+		<HR></HR>
+		<H2>History: FOSI</H2>
+		<UL>
+
+	<LI>FOSI: "Formatted Output Specification Instance"
+<UL>
+	<LI>MIL-STD-28001
+	</LI>
+
+	<LI>FOSI's are SGML documents
+	</LI>
+
+	<LI>A stylesheet for another document
+	</LI>
+</UL></LI>
+
+	<LI>Obsolete but implemented...
+</LI>
+
+		</UL>
+
+
+
+
+</HTML>