Rev 2955: Fix typo (is_permament => is_permanent) reported on IRC in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2955
revision-id: pqm at pqm.ubuntu.com-20071031141102-b5664t8izotfnc6h
parent: pqm at pqm.ubuntu.com-20071031123737-3srdl8uoj1o9vb69
parent: v.ladeuil+lp at free.fr-20071031124019-ir0as6cxx5tjpayy
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-10-31 14:11:02 +0000
message:
  Fix typo (is_permament => is_permanent) reported on IRC
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
    ------------------------------------------------------------
    revno: 2954.1.1
    merged: v.ladeuil+lp at free.fr-20071031124019-ir0as6cxx5tjpayy
    parent: pqm at pqm.ubuntu.com-20071031123737-3srdl8uoj1o9vb69
    parent: v.ladeuil+lp at free.fr-20071031123811-ya0py5cpwhh6rabl
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: trunk
    timestamp: Wed 2007-10-31 13:40:19 +0100
    message:
      Fix typo (is_permament => is_permanent) reported on IRC
    ------------------------------------------------------------
    revno: 2949.4.1
    merged: v.ladeuil+lp at free.fr-20071031123811-ya0py5cpwhh6rabl
    parent: pqm at pqm.ubuntu.com-20071029221703-zy7q7a0ehfvpybtn
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: http
    timestamp: Wed 2007-10-31 13:38:11 +0100
    message:
      Fix typo (is_permament => is_permanent) reported on IRC
      
      * bzrlib/errors.py:
      (RedirectRequested.__init__): Fix typo and delete useless
      attribute.
      
      * bzrlib/transport/http/_urllib.py:
      (HttpTransport_urllib._perform): Fix typo.
      
      * bzrlib/transport/http/_pycurl.py:
      (PyCurlTransport._curl_perform): Fix typo.
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2007-10-30 17:39:11 +0000
+++ b/bzrlib/errors.py	2007-10-31 12:40:19 +0000
@@ -1482,14 +1482,13 @@
 
     _fmt = '%(source)s is%(permanently)s redirected to %(target)s'
 
-    def __init__(self, source, target, is_permament=False, qual_proto=None):
+    def __init__(self, source, target, is_permanent=False, qual_proto=None):
         self.source = source
         self.target = target
-        if is_permament:
+        if is_permanent:
             self.permanently = ' permanently'
         else:
             self.permanently = ''
-        self.is_permament = is_permament
         self._qualified_proto = qual_proto
         TransportError.__init__(self)
 

=== modified file 'bzrlib/transport/http/_pycurl.py'
--- a/bzrlib/transport/http/_pycurl.py	2007-10-19 19:56:06 +0000
+++ b/bzrlib/transport/http/_pycurl.py	2007-10-31 12:38:11 +0000
@@ -312,7 +312,7 @@
             redirected_to = headers['Location']
             raise errors.RedirectRequested(url,
                                            redirected_to,
-                                           is_permament=(code == 301),
+                                           is_permanent=(code == 301),
                                            qual_proto=self._scheme)
 
 

=== modified file 'bzrlib/transport/http/_urllib.py'
--- a/bzrlib/transport/http/_urllib.py	2007-10-19 19:56:06 +0000
+++ b/bzrlib/transport/http/_urllib.py	2007-10-31 12:38:11 +0000
@@ -106,7 +106,7 @@
                 and code in (301, 302, 303, 307):
             raise errors.RedirectRequested(request.get_full_url(),
                                            request.redirected_to,
-                                           is_permament=(code == 301),
+                                           is_permanent=(code == 301),
                                            qual_proto=self._scheme)
 
         if request.redirected_to is not None: