Author: Amaury Forgeot d'Arc <[email protected]>
Branch:
Changeset: r70608:319a2085bf79
Date: 2014-04-12 22:04 +0200
http://bitbucket.org/pypy/pypy/changeset/319a2085bf79/
Log: Move src/cjkcodecs C files from rpython/ to
pypy/module/_multibytecodec.
They are unlikely to be reused for other kinds of interpreters, and
they will slightly change in Python3.3 and Python3.4.
diff --git a/pypy/module/_multibytecodec/c_codecs.py
b/pypy/module/_multibytecodec/c_codecs.py
--- a/pypy/module/_multibytecodec/c_codecs.py
+++ b/pypy/module/_multibytecodec/c_codecs.py
@@ -1,7 +1,6 @@
import py
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.translator.tool.cbuild import ExternalCompilationInfo
-from rpython.conftest import cdir
UNICODE_REPLACEMENT_CHARACTER = u'\uFFFD'
@@ -15,7 +14,7 @@
return 'EncodeDecodeError(%r, %r, %r)' % (self.start, self.end,
self.reason)
-srcdir = py.path.local(cdir)
+srcdir = py.path.local(__file__).dirpath()
codecs = [
# _codecs_cn
diff --git a/rpython/translator/c/src/cjkcodecs/README
b/pypy/module/_multibytecodec/src/cjkcodecs/README
rename from rpython/translator/c/src/cjkcodecs/README
rename to pypy/module/_multibytecodec/src/cjkcodecs/README
diff --git a/rpython/translator/c/src/cjkcodecs/_codecs_cn.c
b/pypy/module/_multibytecodec/src/cjkcodecs/_codecs_cn.c
rename from rpython/translator/c/src/cjkcodecs/_codecs_cn.c
rename to pypy/module/_multibytecodec/src/cjkcodecs/_codecs_cn.c
diff --git a/rpython/translator/c/src/cjkcodecs/_codecs_hk.c
b/pypy/module/_multibytecodec/src/cjkcodecs/_codecs_hk.c
rename from rpython/translator/c/src/cjkcodecs/_codecs_hk.c
rename to pypy/module/_multibytecodec/src/cjkcodecs/_codecs_hk.c
diff --git a/rpython/translator/c/src/cjkcodecs/_codecs_iso2022.c
b/pypy/module/_multibytecodec/src/cjkcodecs/_codecs_iso2022.c
rename from rpython/translator/c/src/cjkcodecs/_codecs_iso2022.c
rename to pypy/module/_multibytecodec/src/cjkcodecs/_codecs_iso2022.c
diff --git a/rpython/translator/c/src/cjkcodecs/_codecs_jp.c
b/pypy/module/_multibytecodec/src/cjkcodecs/_codecs_jp.c
rename from rpython/translator/c/src/cjkcodecs/_codecs_jp.c
rename to pypy/module/_multibytecodec/src/cjkcodecs/_codecs_jp.c
diff --git a/rpython/translator/c/src/cjkcodecs/_codecs_kr.c
b/pypy/module/_multibytecodec/src/cjkcodecs/_codecs_kr.c
rename from rpython/translator/c/src/cjkcodecs/_codecs_kr.c
rename to pypy/module/_multibytecodec/src/cjkcodecs/_codecs_kr.c
diff --git a/rpython/translator/c/src/cjkcodecs/_codecs_tw.c
b/pypy/module/_multibytecodec/src/cjkcodecs/_codecs_tw.c
rename from rpython/translator/c/src/cjkcodecs/_codecs_tw.c
rename to pypy/module/_multibytecodec/src/cjkcodecs/_codecs_tw.c
diff --git a/rpython/translator/c/src/cjkcodecs/alg_jisx0201.h
b/pypy/module/_multibytecodec/src/cjkcodecs/alg_jisx0201.h
rename from rpython/translator/c/src/cjkcodecs/alg_jisx0201.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/alg_jisx0201.h
diff --git a/rpython/translator/c/src/cjkcodecs/cjkcodecs.h
b/pypy/module/_multibytecodec/src/cjkcodecs/cjkcodecs.h
rename from rpython/translator/c/src/cjkcodecs/cjkcodecs.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/cjkcodecs.h
diff --git a/rpython/translator/c/src/cjkcodecs/emu_jisx0213_2000.h
b/pypy/module/_multibytecodec/src/cjkcodecs/emu_jisx0213_2000.h
rename from rpython/translator/c/src/cjkcodecs/emu_jisx0213_2000.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/emu_jisx0213_2000.h
diff --git a/rpython/translator/c/src/cjkcodecs/mappings_cn.h
b/pypy/module/_multibytecodec/src/cjkcodecs/mappings_cn.h
rename from rpython/translator/c/src/cjkcodecs/mappings_cn.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/mappings_cn.h
diff --git a/rpython/translator/c/src/cjkcodecs/mappings_hk.h
b/pypy/module/_multibytecodec/src/cjkcodecs/mappings_hk.h
rename from rpython/translator/c/src/cjkcodecs/mappings_hk.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/mappings_hk.h
diff --git a/rpython/translator/c/src/cjkcodecs/mappings_jisx0213_pair.h
b/pypy/module/_multibytecodec/src/cjkcodecs/mappings_jisx0213_pair.h
rename from rpython/translator/c/src/cjkcodecs/mappings_jisx0213_pair.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/mappings_jisx0213_pair.h
diff --git a/rpython/translator/c/src/cjkcodecs/mappings_jp.h
b/pypy/module/_multibytecodec/src/cjkcodecs/mappings_jp.h
rename from rpython/translator/c/src/cjkcodecs/mappings_jp.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/mappings_jp.h
diff --git a/rpython/translator/c/src/cjkcodecs/mappings_kr.h
b/pypy/module/_multibytecodec/src/cjkcodecs/mappings_kr.h
rename from rpython/translator/c/src/cjkcodecs/mappings_kr.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/mappings_kr.h
diff --git a/rpython/translator/c/src/cjkcodecs/mappings_tw.h
b/pypy/module/_multibytecodec/src/cjkcodecs/mappings_tw.h
rename from rpython/translator/c/src/cjkcodecs/mappings_tw.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/mappings_tw.h
diff --git a/rpython/translator/c/src/cjkcodecs/multibytecodec.c
b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
rename from rpython/translator/c/src/cjkcodecs/multibytecodec.c
rename to pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.c
diff --git a/rpython/translator/c/src/cjkcodecs/multibytecodec.h
b/pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
rename from rpython/translator/c/src/cjkcodecs/multibytecodec.h
rename to pypy/module/_multibytecodec/src/cjkcodecs/multibytecodec.h
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
