diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-29 23:40:53 +0200 | 
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-09-29 23:40:53 +0200 | 
| commit | 121aab4ba13e2a26d0414da862cdf887e3a0395b (patch) | |
| tree | 48a7018ab84eb6a4fe548ffb4f3e6465a0a8dbc2 /Modules/_pickle.c | |
| parent | 6364927cec4950ecd0c9d93377a213e4d0d507bd (diff) | |
| download | cpython-git-121aab4ba13e2a26d0414da862cdf887e3a0395b.tar.gz | |
Strip trailing spaces of _pickle.c
Diffstat (limited to 'Modules/_pickle.c')
| -rw-r--r-- | Modules/_pickle.c | 34 | 
1 files changed, 17 insertions, 17 deletions
diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 19fac40af9..52965a4a1b 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -605,7 +605,7 @@ PyMemoTable_Set(PyMemoTable *self, PyObject *key, Py_ssize_t value)  /*************************************************************************/  /* Helpers for creating the argument tuple passed to functions. This has the -   performance advantage of calling PyTuple_New() only once.  +   performance advantage of calling PyTuple_New() only once.     XXX(avassalotti): Inline directly in _Pickler_FastCall() and     _Unpickler_FastCall(). */ @@ -813,7 +813,7 @@ _Pickler_SetProtocol(PicklerObject *self, PyObject *proto_obj,      fix_imports = PyObject_IsTrue(fix_imports_obj);      if (fix_imports == -1)          return -1; -     +      self->proto = proto;      self->bin = proto > 0;      self->fix_imports = fix_imports && proto < 3; @@ -909,7 +909,7 @@ _Unpickler_ReadFromFile(UnpicklerObject *self, Py_ssize_t n)      Py_ssize_t read_size, prefetched_size = 0;      assert(self->read != NULL); -     +      if (_Unpickler_SkipConsumed(self) < 0)          return -1; @@ -1037,7 +1037,7 @@ _Unpickler_Readline(UnpicklerObject *self, char **result)          self->next_read_idx = num_read;          return _Unpickler_CopyLine(self, self->input_buffer, num_read, result);      } -  +      /* If we get here, we've run off the end of the input string. Return the         remaining string and let the caller figure it out. */      *result = self->input_buffer + self->next_read_idx; @@ -1601,7 +1601,7 @@ save_long(PicklerObject *self, PyObject *obj)           * bits.           */          if (sign < 0 && -            nbytes > 1 &&  +            nbytes > 1 &&              pdata[nbytes - 1] == 0xff &&              (pdata[nbytes - 2] & 0x80) != 0) {              nbytes--; @@ -1667,7 +1667,7 @@ save_float(PicklerObject *self, PyObject *obj)              return -1;          if (_Pickler_Write(self, pdata, 9) < 0)              return -1; -   }  +   }      else {          int result = -1;          char *buf = NULL; @@ -1782,10 +1782,10 @@ raw_unicode_escape(const Py_UNICODE *s, Py_ssize_t size)  #else      const Py_ssize_t expandsize = 6;  #endif -     +      if (size > PY_SSIZE_T_MAX / expandsize)          return PyErr_NoMemory(); -     +      repr = PyByteArray_FromStringAndSize(NULL, expandsize * size);      if (repr == NULL)          return NULL; @@ -3055,7 +3055,7 @@ save_reduce(PicklerObject *self, PyObject *args, PyObject *obj)          return -1;      if (state) { -        if (save(self, state, 0) < 0 ||  +        if (save(self, state, 0) < 0 ||              _Pickler_Write(self, &build_op, 1) < 0)              return -1;      } @@ -3309,7 +3309,7 @@ Pickler_dump(PicklerObject *self, PyObject *args)         Developers often forget to call __init__() in their subclasses, which         would trigger a segfault without this check. */      if (self->write == NULL) { -        PyErr_Format(PicklingError,  +        PyErr_Format(PicklingError,                       "Pickler.__init__() was not called by %s.__init__()",                       Py_TYPE(self)->tp_name);          return NULL; @@ -3789,7 +3789,7 @@ static PyTypeObject Pickler_Type = {      0,                                  /*tp_is_gc*/  }; -/* Temporary helper for calling self.find_class().  +/* Temporary helper for calling self.find_class().     XXX: It would be nice to able to avoid Python function call overhead, by     using directly the C version of find_class(), when find_class() is not @@ -3842,7 +3842,7 @@ load_int(UnpicklerObject *self)          return bad_readline();      errno = 0; -    /* XXX: Should the base argument of strtol() be explicitly set to 10?  +    /* XXX: Should the base argument of strtol() be explicitly set to 10?         XXX(avassalotti): Should this uses PyOS_strtol()? */      x = strtol(s, &endptr, 0); @@ -4207,7 +4207,7 @@ load_binstring(UnpicklerObject *self)      x = calc_binint(s, 4);      if (x < 0) { -        PyErr_SetString(UnpicklingError,  +        PyErr_SetString(UnpicklingError,                          "BINSTRING pickle has negative byte count");          return -1;      } @@ -5001,7 +5001,7 @@ do_setitems(UnpicklerObject *self, Py_ssize_t x)          return stack_underflow();      if (len == x)  /* nothing to do */          return 0; -    if ((len - x) % 2 != 0) {  +    if ((len - x) % 2 != 0) {          /* Currupt or hostile pickle -- we never write one like this. */          PyErr_SetString(UnpicklingError, "odd number of items for SETITEMS");          return -1; @@ -5358,7 +5358,7 @@ Unpickler_load(UnpicklerObject *self)         not call Unpickler.__init__(). Here, we simply ensure that self->read         is not NULL. */      if (self->read == NULL) { -        PyErr_Format(UnpicklingError,  +        PyErr_Format(UnpicklingError,                       "Unpickler.__init__() was not called by %s.__init__()",                       Py_TYPE(self)->tp_name);          return NULL; @@ -5460,7 +5460,7 @@ Unpickler_find_class(UnpicklerObject *self, PyObject *args)          global = PyObject_GetAttr(module, global_name);          Py_DECREF(module);      } -    else {  +    else {          global = PyObject_GetAttr(module, global_name);      }      return global; @@ -5637,7 +5637,7 @@ Unpickler_init(UnpicklerObject *self, PyObject *args, PyObject *kwds)   * intentional, as these should be treated as black-box implementation details.   *   * We do, however, have to implement pickling/unpickling support because of - * real-world code like cvs2svn.  + * real-world code like cvs2svn.   */  typedef struct {  | 
