← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/_knit_load_data_pyx.pyx

Merge the 2.0 branch, resolve one conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_knit_load_data_pyx.pyx
97
97
        self.end_str = NULL
98
98
        self.history_len = 0
99
99
 
100
 
    cdef void validate(self):
 
100
    cdef int validate(self) except -1:
101
101
        if not PyDict_CheckExact(self.cache):
102
102
            raise TypeError('kndx._cache must be a python dict')
103
103
        if not PyList_CheckExact(self.history):
104
104
            raise TypeError('kndx._history must be a python list')
 
105
        return 0
105
106
 
106
107
    cdef object process_options(self, char *option_str, char *end):
107
108
        """Process the options string into a list."""