Author: Amaury Forgeot d'Arc <[email protected]>
Branch: kill_ll_termios
Changeset: r75281:289505ce5487
Date: 2015-01-10 12:33 +0100
http://bitbucket.org/pypy/pypy/changeset/289505ce5487/
Log: Finally remove ll_termios.py
diff --git a/rpython/rtyper/module/test/test_ll_termios.py
b/rpython/rlib/test/test_rtermios.py
rename from rpython/rtyper/module/test/test_ll_termios.py
rename to rpython/rlib/test/test_rtermios.py
--- a/rpython/rtyper/module/test/test_ll_termios.py
+++ b/rpython/rlib/test/test_rtermios.py
@@ -77,7 +77,6 @@
def test_tcrest(self):
from rpython.translator.c.test.test_genc import compile
- from rpython.rtyper.module import ll_termios
from rpython.rlib import rtermios
def runs_tcall():
rtermios.tcsendbreak(2, 0)
diff --git a/rpython/rtyper/extfuncregistry.py
b/rpython/rtyper/extfuncregistry.py
--- a/rpython/rtyper/extfuncregistry.py
+++ b/rpython/rtyper/extfuncregistry.py
@@ -10,12 +10,6 @@
from rpython.rtyper.module import ll_os
from rpython.rtyper.module import ll_time
from rpython.rlib import rfloat
-try:
- import termios
-except ImportError:
- pass
-else:
- from rpython.rtyper.module import ll_termios
# the following functions all take one float, return one float
# and are part of math.h
diff --git a/rpython/rtyper/module/ll_termios.py
b/rpython/rtyper/module/ll_termios.py
deleted file mode 100644
--- a/rpython/rtyper/module/ll_termios.py
+++ /dev/null
@@ -1,55 +0,0 @@
-
-"""
-The low-level implementation of termios module
-note that this module should only be imported when
-termios module is there
-"""
-
-import termios
-from rpython.rtyper.lltypesystem import rffi
-from rpython.rtyper.lltypesystem import lltype
-from rpython.rtyper.extfunc import lazy_register, register_external
-from rpython.rlib.rarithmetic import intmask
-from rpython.rtyper.extregistry import ExtRegistryEntry
-from rpython.annotator import model as annmodel
-from rpython.rtyper import rclass
-from rpython.rlib import rtermios, rposix
-from rpython.rtyper.tool import rffi_platform
-from rpython.translator.tool.cbuild import ExternalCompilationInfo
-
-eci = ExternalCompilationInfo(
- includes = ['termios.h', 'unistd.h']
-)
-
-class CConfig:
- _compilation_info_ = eci
- NCCS = rffi_platform.DefinedConstantInteger('NCCS')
- _HAVE_STRUCT_TERMIOS_C_ISPEED = rffi_platform.Defined(
- '_HAVE_STRUCT_TERMIOS_C_ISPEED')
- _HAVE_STRUCT_TERMIOS_C_OSPEED = rffi_platform.Defined(
- '_HAVE_STRUCT_TERMIOS_C_OSPEED')
-
-c_config = rffi_platform.configure(CConfig)
-NCCS = c_config['NCCS']
-
-TCFLAG_T = rffi.UINT
-CC_T = rffi.UCHAR
-SPEED_T = rffi.UINT
-INT = rffi.INT
-
-_add = []
-if c_config['_HAVE_STRUCT_TERMIOS_C_ISPEED']:
- _add.append(('c_ispeed', SPEED_T))
-if c_config['_HAVE_STRUCT_TERMIOS_C_OSPEED']:
- _add.append(('c_ospeed', SPEED_T))
-TERMIOSP = rffi.CStructPtr('termios', ('c_iflag', TCFLAG_T), ('c_oflag',
TCFLAG_T),
- ('c_cflag', TCFLAG_T), ('c_lflag', TCFLAG_T),
- ('c_line', CC_T),
- ('c_cc', lltype.FixedSizeArray(CC_T, NCCS)), *_add)
-
-def c_external(name, args, result):
- return rffi.llexternal(name, args, result, compilation_info=eci)
-
-
-# a bit C-c C-v code follows...
-
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
