On Sun, 2009-08-23 at 21:30 +0000, Robert Collins wrote: > === modified file 'txaws/client/gui/gtk.py' > --- txaws/client/gui/gtk.py 2009-08-18 22:53:53 +0000 > +++ txaws/client/gui/gtk.py 2009-08-20 19:14:32 +0000 > @@ -8,7 +8,7 @@ > import gobject > import gtk > > -from txaws.credentials import AWSCredentials > +from txaws.ec2.service import EC2Service > > > __all__ = ['main'] > @@ -27,10 +27,10 @@ > # Nested import because otherwise we get 'reactor already > installed'. > self.password_dialog = None > try: > - creds = AWSCredentials() > + service = AWSService()
This is going to be a NameError :P
... > === added file 'txaws/credentials.py'
this file already exists. I think you've done something weird in your branch. lets review once thats fixed. Find me in #bzr :P
review needsfixing
--
« Back to merge proposal
On Sun, 2009-08-23 at 21:30 +0000, Robert Collins wrote: client/ gui/gtk. py' gui/gtk. py 2009-08-18 22:53:53 +0000 gui/gtk. py 2009-08-20 19:14:32 +0000 dialog = None
> === modified file 'txaws/
> --- txaws/client/
> +++ txaws/client/
> @@ -8,7 +8,7 @@
> import gobject
> import gtk
>
> -from txaws.credentials import AWSCredentials
> +from txaws.ec2.service import EC2Service
>
>
> __all__ = ['main']
> @@ -27,10 +27,10 @@
> # Nested import because otherwise we get 'reactor already
> installed'.
> self.password_
> try:
> - creds = AWSCredentials()
> + service = AWSService()
This is going to be a NameError :P
... credentials. py'
> === added file 'txaws/
this file already exists. I think you've done something weird in your
branch. lets review once thats fixed. Find me in #bzr :P
review needsfixing
--