# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dwayne@oscl.ca-20080212152427-0yk4nmzg1th27vd7
# target_branch: http://www.lag.net/paramiko/bzr/paramiko/
# testament_sha1: 0bae114388e3aa7027d6943b45c1145fb172b682
# timestamp: 2008-02-12 09:25:41 -0600
# base_revision_id: robey@lag.net-20080124045017-dfqiamorj356btrd
# 
# Begin patch
=== modified file 'paramiko/osrandom.py'
--- paramiko/osrandom.py	2008-01-14 15:27:12 +0000
+++ paramiko/osrandom.py	2008-02-12 14:39:06 +0000
@@ -44,7 +44,7 @@
     try:
         _dev_urandom = open("/dev/urandom", "rb", 0)
         def urandom(bytes):
-            return _def_urandom.read(bytes)
+            return _dev_urandom.read(bytes)
         osrandom_source = "/dev/urandom"
     except (OSError, IOError):
         pass

=== modified file 'tests/test_buffered_pipe.py'
--- tests/test_buffered_pipe.py	2007-10-29 03:03:44 +0000
+++ tests/test_buffered_pipe.py	2008-02-12 15:24:27 +0000
@@ -41,6 +41,9 @@
 
 class BufferedPipeTest (unittest.TestCase):
 
+    assertTrue = unittest.TestCase.failUnless   # for Python 2.3 and below
+    assertFalse = unittest.TestCase.failIf      # for Python 2.3 and below
+
     def test_1_buffered_pipe(self):
         p = BufferedPipe()
         self.assert_(not p.read_ready())

=== modified file 'tests/test_transport.py'
--- tests/test_transport.py	2008-01-24 01:41:21 +0000
+++ tests/test_transport.py	2008-02-12 15:24:27 +0000
@@ -90,6 +90,9 @@
 
 class TransportTest (unittest.TestCase):
 
+    assertTrue = unittest.TestCase.failUnless   # for Python 2.3 and below
+    assertFalse = unittest.TestCase.failIf      # for Python 2.3 and below
+
     def setUp(self):
         self.socks = LoopSocket()
         self.sockc = LoopSocket()

=== modified file 'tests/test_util.py'
--- tests/test_util.py	2007-02-13 19:17:06 +0000
+++ tests/test_util.py	2008-02-12 15:24:27 +0000
@@ -59,6 +59,9 @@
 
 class UtilTest (unittest.TestCase):
 
+    assertTrue = unittest.TestCase.failUnless   # for Python 2.3 and below
+    assertFalse = unittest.TestCase.failIf      # for Python 2.3 and below
+
     def setUp(self):
         pass
 

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeQdUOwABDxfgFBQWWP//18m
3gC////wYAe90fJAAAr5A0GqNtloRzCYBMAJhMJpgAAEyaaBjmEwCYATCYTTAAAJk00DDKk2p7Uh
kAyNqAADRoAAAASKTRM0o8E1T9CnlPTUDajRiNGg0yND9UCKkJoaNCaGmymmNQ0Yg0AZBoACpRAm
TICeo0KemQNRqeJ6o8o0YJoHqREfxY2mDv3EnbCA/xjq0dhTMVSrUFGQmOmBAUg0FqYuQ6iwgJFV
ZcRkkKCKY2iOzwSXAdha8FsH9FeoX07Q8gMbG2034fdF3jOUjjOk1dGJB2u+maa9lAyieCw1gWpV
yF+e4VkSgOYWPhiZlMCAwq0VzBrYNg5s5gKmEPcLk4ZacbJR6CcymyywKnXfjS+Y/tsphZbtu3Bb
bc1WknunhMXbFX7RpXr8tqP9ORsUY1KSHR1TlhHL+HqJa53yl0lE9QqxIxF5wW+MYsZMr0tt0YQg
usbAkZuzSdVQiLSbCCMr1NcYYCNzOAxCklTOvE3plshni2NjT4TbpavbZZHFlVsMsYWLNFZVoqtU
RNjYowZRVMDN5vPJmueiK04pvoUpW5ldK7b1X12OH0l7c4TmyW+pkvzkLWBbjbZ4606mzjfvTevT
ZW2G3Y5upeuRlm41WLWKxaq0WzX1zs3yv4X868U0c2TV5Ipr2cW9a7ON8m9OgLDmsldshhSshctV
TNFpZ0bUW5etHLCWdbGGByWuDL/cKX8JdrLNladia6aVovku2rOq5nNzo3NZVeYw7mmXc5NF6jJ1
KNjF2cmDBWtrnv5KS9osSindTcxasEWOKxxvhisYYzJ64tl9Kyi6cmfKc7sGjaq5JnFrFVquc1fL
/n3oy460x7TsmSjo56L3LgskZO+VbWbBrOzdybo2TLrdrkqvUeHjbz3ZN9N5KZlXa3c7sHNvasOP
a5Msuu1nq397LgcJtk3WNXBSWLGTK9lsW0tti9F8cbJkwt2K5sLFMXpuvWNzNWx0WTLMWSrJco48
cW9c7dyLNktRLOazSc3O5i534Ku9yspcyOTbyY9Src3NrB4qnr91rc7vjDTlvXw4OHJTucGrNdk4
a97k3UVWLl3U6ljg6dM1rk8+Oc7sW9SWc6nOUXKyWjhFuSYQvqEpcekPeMS6hhzahbzYNVA7w9hA
1+tjTIrKqUoonR/WPi3q2LlhgoqxtXkskjRSjAYQga6w3JSSNukmhvESkFgpoGsyN5KYzeooZClM
fClps59WBN8eUY2/CVut+umCECMICUSx0+V21QfhSX8eKRWt5Pe9jsWs3tWPYxeT2vtRV7dmTBXH
ueonM64fenf+k6JasnWq7UpJr+84IW/omv5J849BPTU955quFHm8n3PCj1Hi9JL1HFMW75ofFphP
hPz+US17DRxWLHsb1qqr2z5JHg44tHveOxe+3U9llHvSMn8Lk0x27M21yt0b3k5Nj8bVr6NJPkjI
VZvFzScJtYvgv1DgR+O28tUeIqbBPabEG86zs5DgDgMghrYXz1TJ8zn6Xl6bpcWTWdk254uy67HP
1WNmzk1b3me5PqWJHdpQ/FTkXQ4vu18H722zvdj+VjisTZwWnrShN2bW6wb5sdKUTuFLe45TUsk/
6lJKusmmaiFqMkLn8Tx6NW9Vq9zzfV9yjc+bFg+KUe9thsap7Zw/wfA+R2dtSb57lLcweISeJGk6
EMxxm1cxkEhUDFP27CxItO6hXbm+0pxeiTwvOpOis5p1Eqdf0hpz9qfTvWrysIZ2nSITm4P0YdZY
DJ0ocCZ8FSGV2CYjHfhDwh7lzBIrMxRP9koTjPf40fFKzzk5PTxThvjZgn1eLM/ta72KsfBN6L7Z
MqN9GtEzig8kraxGEKJ2L1Ej5EtaME+0yQpqCgTE2ClAXH085YCzFGFGYuAvMc6UhBUV0LC6EMLE
k5GOQU8sUKKso6r0ZaL+0gFk8nkLk5TaPfPLLj6smRR3+SNZ5nuhazk8akNQQM7SWHKobG1XSrik
AztOkkFwxTGg6HTYtaQ0cvcjWtzKrqcgJcSUBDYfZQFiptL4NiUUtLkj5Q8pgnhuvSyqaJxuQqYj
qtmm2zrMMBSYSK1GpAZacS3FlCWUZRzEUyPoKpR03LU8t9idO+kpSwaPyRW+Tloay00htTq5ysX0
Go5WGFjhZO3Ce72MftGzFM+em/qusm/7qfqjalUME1/VzSMdHwh0jd9Ed21Hx6OToiqq1Cr80eoS
3u+clndvLlPijohMeaH+LuSKcKEhyDqh2A==