[pypy-commit] pypy kill-someobject: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: kill-someobject
Changeset: r57850:4b69b6e90f73
Date: 2012-10-07 20:19 +0200
http://bitbucket.org/pypy/pypy/changeset/4b69b6e90f73/

Log:	merge

diff --git a/pypy/translator/c/database.py b/pypy/translator/c/database.py
--- a/pypy/translator/c/database.py
+++ b/pypy/translator/c/database.py
@@ -27,13 +27,11 @@
     gctransformer = None
 
     def __init__(self, translator=None, standalone=False,
-                 cpython_extension=False,
                  gcpolicyclass=None,
                  thread_enabled=False,
                  sandbox=False):
         self.translator = translator
         self.standalone = standalone
-        self.cpython_extension = cpython_extension
         self.sandbox    = sandbox
         if gcpolicyclass is None:
             gcpolicyclass = gc.RefcountingGcPolicy
diff --git a/pypy/translator/c/dlltool.py b/pypy/translator/c/dlltool.py
--- a/pypy/translator/c/dlltool.py
+++ b/pypy/translator/c/dlltool.py
@@ -1,9 +1,10 @@
 
 from pypy.translator.driver import TranslationDriver
-from pypy.translator.c.genc import CBuilder, CCompilerDriver
+from pypy.translator.c.genc import CBuilder
 from pypy.rpython.typesystem import getfunctionptr
 from pypy.translator.tool.cbuild import ExternalCompilationInfo
 
+
 class CLibraryBuilder(CBuilder):
     standalone = False
     split = True
@@ -38,6 +39,7 @@
     def get_entry_point(self, isolated=False):
         return self.so_name
 
+
 class DLLDef(object):
     def __init__(self, name, functions=[], policy=None, config=None):
         self.name = name
diff --git a/pypy/translator/c/genc.py b/pypy/translator/c/genc.py
--- a/pypy/translator/c/genc.py
+++ b/pypy/translator/c/genc.py
@@ -118,8 +118,7 @@
     _compiled = False
     modulename = None
     split = False
-    cpython_extension = False
-    
+
     def __init__(self, translator, entrypoint, config, gcpolicy=None,
             secondary_entrypoints=()):
         self.translator = translator
@@ -146,7 +145,6 @@
                 raise NotImplementedError("--gcrootfinder=asmgcc requires standalone")
 
         db = LowLevelDatabase(translator, standalone=self.standalone,
-                              cpython_extension=self.cpython_extension,
                               gcpolicyclass=gcpolicyclass,
                               thread_enabled=self.config.translation.thread,
                               sandbox=self.config.translation.sandbox)
@@ -244,8 +242,6 @@
             CBuilder.have___thread = self.translator.platform.check___thread()
         if not self.standalone:
             assert not self.config.translation.instrument
-            if self.cpython_extension:
-                defines['PYPY_CPYTHON_EXTENSION'] = 1
         else:
             defines['PYPY_STANDALONE'] = db.get(pf)
             if self.config.translation.instrument: