Merge lp:~burger.ga/command-not-found/bug-1073919 into lp:~command-not-found-developers/command-not-found/trunk

[Gerhard Burger]

fixes bug 1073919 by moving python2 only code (str.decode) to the python2 block

[Zygmunt Krynicki (zyga)]

+1

if you can, please propose this to

https://github.com/zyga/command-not-found

Otherwise I'll apply it there later today. Thanks

review: Approve

[Gerhard Burger (burger.ga)]

> +1
>
> if you can, please propose this to
>
> https://github.com/zyga/command-not-found
>
> Otherwise I'll apply it there later today. Thanks

Thanks! Is this a sort of official upstream for command-not-found?
I'll propose this to github as well.

[Zygmunt Krynicki (zyga)]

Yeah. I've been trying to move to github for a while now. It's far easier
to contribute to and we can still keep all the bzr imports here (we already
do IIRC)

Thanks
ZK

On Mon, Jun 17, 2013 at 1:24 PM, Gerhard Burger <email address hidden> wrote:

> > +1
> >
> > if you can, please propose this to
> >
> > https://github.com/zyga/command-not-found
> >
> > Otherwise I'll apply it there later today. Thanks
>
> Thanks! Is this a sort of official upstream for command-not-found?
> I'll propose this to github as well.
> --
>
> https://code.launchpad.net/~burger.ga/command-not-found/bug-1073919/+merge/169743
> You are reviewing the proposed merge of lp:~
> burger.ga/command-not-found/bug-1073919 into lp:command-not-found.
>

[Gerhard Burger (burger.ga)]

Yes, doing it in github is way easier ;)

On Mon, Jun 17, 2013 at 1:31 PM, Zygmunt Krynicki <
<email address hidden>> wrote:

> Yeah. I've been trying to move to github for a while now. It's far easier
> to contribute to and we can still keep all the bzr imports here (we already
> do IIRC)
>
> Thanks
> ZK
>
>
> On Mon, Jun 17, 2013 at 1:24 PM, Gerhard Burger <email address hidden>
> wrote:
>
> > > +1
> > >
> > > if you can, please propose this to
> > >
> > > https://github.com/zyga/command-not-found
> > >
> > > Otherwise I'll apply it there later today. Thanks
> >
> > Thanks! Is this a sort of official upstream for command-not-found?
> > I'll propose this to github as well.
> > --
> >
> >
> https://code.launchpad.net/~burger.ga/command-not-found/bug-1073919/+merge/169743
> > You are reviewing the proposed merge of lp:~
> > burger.ga/command-not-found/bug-1073919 into lp:command-not-found.
> >
>
> --
>
> https://code.launchpad.net/~burger.ga/command-not-found/bug-1073919/+merge/169743
> You are the owner of lp:~burger.ga/command-not-found/bug-1073919.
>

=== modified file 'CommandNotFound/CommandNotFound.py'
--- CommandNotFound/CommandNotFound.py	2012-06-13 16:09:46 +0000
+++ CommandNotFound/CommandNotFound.py	2013-06-17 09:13:31 +0000
@@ -212,9 +212,9 @@
                 answer = input(prompt)
             else:
                 answer = raw_input(prompt)
-            if sys.stdin.encoding and isinstance(answer, str):
-                # Decode the answer so that we get an unicode value
-                answer = answer.decode(sys.stdin.encoding)
+                if sys.stdin.encoding and isinstance(answer, str):
+                    # Decode the answer so that we get an unicode value
+                    answer = answer.decode(sys.stdin.encoding)
             if answer.lower() == _("y"):
                 if posix.geteuid() == 0:
                     command_prefix = ""