# HG changeset patch # User Paul Boddie # Date 1315346717 -7200 # Node ID 83134829dbf4cc9782f03daaed2af8ed98b2b3bc # Parent 70c5fbacbad6b791f37d019c8a42e82f7ac70180 Added missing lib/builtin files to the install manifest. Removed obsolete patches. diff -r 70c5fbacbad6 -r 83134829dbf4 debian/shedskin.install --- a/debian/shedskin.install Tue Sep 06 23:58:04 2011 +0200 +++ b/debian/shedskin.install Wed Sep 07 00:05:17 2011 +0200 @@ -1,5 +1,7 @@ shedskin/lib/*.cpp usr/share/shedskin/lib/ shedskin/lib/*.hpp usr/share/shedskin/lib/ +shedskin/lib/builtin/*.cpp usr/share/shedskin/lib/builtin/ +shedskin/lib/builtin/*.hpp usr/share/shedskin/lib/builtin/ shedskin/lib/*.py usr/share/shedskin/lib/ shedskin/lib/os/*.cpp usr/share/shedskin/lib/os/ shedskin/lib/os/*.hpp usr/share/shedskin/lib/os/ diff -r 70c5fbacbad6 -r 83134829dbf4 python25print.diff --- a/python25print.diff Tue Sep 06 23:58:04 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ ---- shedskin/lib/builtin.py (revision 1507) -+++ shedskin/lib/builtin.py (working copy) -@@ -1,5 +1,3 @@ --from __future__ import print_function -- - class class_: - def __repr__(self): - return self.__name__ -@@ -848,5 +846,5 @@ - return iter1.next() - return fillvalue - --def print(__kw_sep=0, __kw_end=0, __kw_file=0, *value): -+def __print(__kw_sep=0, __kw_end=0, __kw_file=0, *value): - value.__str__() ---- shedskin/graph.py (revision 1507) -+++ shedskin/graph.py (working copy) -@@ -1200,6 +1200,8 @@ - elif isinstance(node.node, Name): - # direct call - ident = node.node.name -+ if ident == 'print': -+ ident = node.node.name = '__print' # XXX - - if ident in ['getattr', 'setattr', 'slice', 'type']: - error("'%s' function is not supported" % ident, node.node) ---- shedskin/cpp.py (revision 1507) -+++ shedskin/cpp.py (working copy) -@@ -1656,6 +1656,8 @@ - return - elif ident == 'hash': - self.append('hasher(') # XXX cleanup -+ elif ident == '__print': # XXX -+ self.append('print(') - elif ident == 'isinstance' and isinstance(node.args[1], Name) and node.args[1].name in ['float','int']: - error("'isinstance' cannot be used with ints or floats; assuming always true", node, warning=True) - self.append('1') -@@ -1716,7 +1718,7 @@ - objexpr, ident, direct_call, method_call, constructor, parent_constr = analyze_callfunc(node) - target = funcs[0] # XXX - -- print_function = self.library_func(funcs, 'builtin', None, 'print') -+ print_function = self.library_func(funcs, 'builtin', None, '__print') - - castnull = False # XXX - if (self.library_func(funcs, 'random', None, 'seed') or \ ---- shedskin/shared.py (revision 1507) -+++ shedskin/shared.py (working copy) -@@ -764,7 +764,7 @@ - missing = formals[len(actuals):-len(func.defaults)] - - skip_defaults = True # XXX -- if not func.mv.module.builtin or func.mv.module.ident in ['random', 'itertools', 'datetime', 'ConfigParser', 'csv'] or (func.ident in ('sort','sorted', 'min', 'max', 'print')): -+ if not func.mv.module.builtin or func.mv.module.ident in ['random', 'itertools', 'datetime', 'ConfigParser', 'csv'] or (func.ident in ('sort','sorted', 'min', 'max', '__print')): - if not (func.mv.module.builtin and func.ident == 'randrange'): - skip_defaults = False - diff -r 70c5fbacbad6 -r 83134829dbf4 setup.py.diff --- a/setup.py.diff Tue Sep 06 23:58:04 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ ---- setup.py 2011-05-26 20:08:09.000000000 +0200 -+++ setup.py 2011-05-27 00:30:34.000000000 +0200 -@@ -8,5 +8,5 @@ - url='http://code.google.com/p/shedskin/', - scripts=['scripts/shedskin'], - packages=['shedskin'], -- package_data={'shedskin': ['lib/*.cpp', 'lib/*.hpp', 'lib/*.py', 'lib/os/*.cpp', 'lib/os/*.hpp', 'lib/os/*.py', 'FLAGS*', 'illegal']}, -+ package_data={'shedskin': ['FLAGS*', 'illegal']}, - ) diff -r 70c5fbacbad6 -r 83134829dbf4 shared.py.diff --- a/shared.py.diff Tue Sep 06 23:58:04 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- shedskin/shared.py 2010-06-20 21:19:21.000000000 +0200 -+++ shedskin/shared.py 2010-06-20 21:19:47.000000000 +0200 -@@ -39,7 +39,7 @@ - self.iterations = 0 - self.lambdawrapper = {} - self.sysdir = '/'.join(__file__.split(os.sep)[:-1]) -- self.libdir = connect_paths(self.sysdir, 'lib') -+ self.libdir = connect_paths('/usr/share/shedskin', 'lib') - self.main_mod = 'test' - self.cpp_keywords = set(['asm', 'auto', 'bool', 'case', 'catch', 'char', 'const', 'const_cast', 'default', 'delete', 'do', 'double', 'dynamic_cast', 'enum', 'explicit', 'export', 'extern', 'false', 'float', 'friend', 'goto', 'inline', 'int', 'long', 'mutable', 'namespace', 'new', 'operator', 'private', 'protected', 'public', 'register', 'reinterpret_cast', 'short', 'signed', 'register', 'sizeof', 'static', 'static_cast', 'struct', 'switch', 'template', 'this', 'throw', 'true', 'typedef', 'typeid', 'typename', 'union', 'unsigned', 'using', 'virtual', 'void', 'volatile', 'wchar_t']) - self.cpp_keywords.update(['stdin', 'stdout', 'stderr', 'std', 'abstract', 'st_mtime', 'st_atime', 'st_ctime', 'errno', 'fileno', 'environ', 'rand', 'optind', 'opterr', 'optopt', 'optarg', 'exit']) diff -r 70c5fbacbad6 -r 83134829dbf4 typename-90ee8e7.diff --- a/typename-90ee8e7.diff Tue Sep 06 23:58:04 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- shedskin/lib/builtin.hpp 2011-03-19 16:08:45.000000000 +0100 -+++ shedskin/lib/builtin.hpp 2011-03-19 16:09:03.000000000 +0100 -@@ -1775,7 +1775,7 @@ - - template inline __ss_bool pyiter::__contains__(T t) { - T e; -- pyiter::for_in_loop __3; -+ typename pyiter::for_in_loop __3; - int __2; - pyiter *__1; - FOR_IN_NEW(e,this,1,2,3) -@@ -2480,7 +2480,7 @@ - dict *c = new dict(); - memo->__setitem__(this, c); - K e; -- dict::for_in_loop __3; -+ typename dict::for_in_loop __3; - int __2; - dict *__1; - FOR_IN_NEW(e,this,1,2,3)