/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/iterablefile.py

Catch spurious exceptions (python-2.6) when SocketServer is shut down.

* bzrlib/tests/test_http.py:
(TestProxyHttpServer.proxied_in_env,
TestProxyHttpServer.not_proxied_in_env): Revert expected and
actual expressions to conform with bzr rules.

* bzrlib/tests/http_server.py:
(HttpServer.__repr__): Added for debug purposes.
(HttpServer._http_start): Catch spurious exceptions when running
with python-2.6.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/iterablefile.py
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
17
 
18
18
 
19
19
class IterableFileBase(object):
251
251
                self._file_base.push_back(line)
252
252
                return lines
253
253
 
254
 
 
 
254
        
255
255
if __name__ == "__main__":
256
256
    import doctest
257
257
    doctest.testmod()