Search Results for "python 3.3"

Perform a merge between two branches incrementally. If conflicts are encountered, figure out exactly which pairs of commits conflict, and present the user with one pairwise conflict at a time for resolution. Reduce the pain of resolving merge conflicts to its unavoidable minimum, by finding and presenting the smallest possible conflicts: those between the changes introduced by one commit from each branch. Allow a merge to be saved, tested, interrupted, published, and collaborated on while it...

A stream implementation for Python that provides transparent base64 encoding and decoding of an underlying stream. This project is designed to develop a class, :class:`base64io.Base64IO`, that implements a streaming interface for Base64 encoding. Python has supported native Base64 encoding since version 2.4. However, there is no streaming interface for Base64 encoding, and none is available from the community. The legacy base64.encode and base64.decode interface lets you shuffle data between...