diff options
| author | Guido van Rossum <guido@python.org> | 2007-05-03 17:49:24 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-05-03 17:49:24 (GMT) |
| commit | 8d30cc0144a6a94e06f3a115b07afa6314466cfd (patch) | |
| tree | 0c0b2f3d75cca4173ec3e8e2962682affbd2e886 /Modules/cPickle.c | |
| parent | 938ef57e267838dcfbfb0d51d9bd40caece1c5db (diff) | |
| download | cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.zip cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.tar.gz cpython-8d30cc0144a6a94e06f3a115b07afa6314466cfd.tar.bz2 | |
Get rid of all #ifdef Py_USING_UNICODE (it is always present now).
(With the help of unifdef from freshmeat.)
Diffstat (limited to 'Modules/cPickle.c')
| -rw-r--r-- | Modules/cPickle.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/Modules/cPickle.c b/Modules/cPickle.c index 7b8ed66..9ce3f65 100644 --- a/Modules/cPickle.c +++ b/Modules/cPickle.c @@ -1256,7 +1256,6 @@ save_string(Picklerobject *self, PyObject *args, int doput) } -#ifdef Py_USING_UNICODE /* A copy of PyUnicode_EncodeRawUnicodeEscape() that also translates backslash and newline characters to \uXXXX escapes. */ static PyObject * @@ -1373,7 +1372,6 @@ save_unicode(Picklerobject *self, PyObject *args, int doput) Py_XDECREF(repr); return -1; } -#endif /* A helper for save_tuple. Push the len elements in tuple t on the stack. */ static int @@ -2225,13 +2223,11 @@ save(Picklerobject *self, PyObject *args, int pers_save) goto finally; } -#ifdef Py_USING_UNICODE case 'u': if ((type == &PyUnicode_Type) && (PyString_GET_SIZE(args) < 2)) { res = save_unicode(self, args, 0); goto finally; } -#endif } if (args->ob_refcnt > 1) { @@ -2255,14 +2251,12 @@ save(Picklerobject *self, PyObject *args, int pers_save) } break; -#ifdef Py_USING_UNICODE case 'u': if (type == &PyUnicode_Type) { res = save_unicode(self, args, 1); goto finally; } break; -#endif case 't': if (type == &PyTuple_Type) { @@ -3326,7 +3320,6 @@ load_short_binstring(Unpicklerobject *self) } -#ifdef Py_USING_UNICODE static int load_unicode(Unpicklerobject *self) { @@ -3346,10 +3339,8 @@ load_unicode(Unpicklerobject *self) finally: return res; } -#endif -#ifdef Py_USING_UNICODE static int load_binunicode(Unpicklerobject *self) { @@ -3370,7 +3361,6 @@ load_binunicode(Unpicklerobject *self) PDATA_PUSH(self->stack, unicode, -1); return 0; } -#endif static int @@ -4347,7 +4337,6 @@ load(Unpicklerobject *self) break; continue; -#ifdef Py_USING_UNICODE case UNICODE: if (load_unicode(self) < 0) break; @@ -4357,7 +4346,6 @@ load(Unpicklerobject *self) if (load_binunicode(self) < 0) break; continue; -#endif case EMPTY_TUPLE: if (load_counted_tuple(self, 0) < 0) @@ -4737,7 +4725,6 @@ noload(Unpicklerobject *self) break; continue; -#ifdef Py_USING_UNICODE case UNICODE: if (load_unicode(self) < 0) break; @@ -4747,7 +4734,6 @@ noload(Unpicklerobject *self) if (load_binunicode(self) < 0) break; continue; -#endif case EMPTY_TUPLE: if (load_counted_tuple(self, 0) < 0) |