Merge lp:~oubiwann/ubuntu-community-accomplishments/946809-module-changes into lp:~ubuntu-community-accomplishments-reviewers/ubuntu-community-accomplishments/0.1

[Duncan McGreggor]

Note that this needs to be merged at the same (approximate) time as the other branch (https://code.launchpad.net/~oubiwann/ubuntu-accomplishments-system/941255-unified-source-dir) since they depend upon each other.

[Jono Bacon (jonobacon)]

Looks like this was mean't to go into lp:ubuntu-accomplishments-system instead. Rejecting: feel free to re-post the MP there.

review: Disapprove

[Duncan McGreggor (oubiwann)]

Wait, so I don't understand your merge comment, Jono:

"Looks like this was mean't to go into lp:ubuntu-accomplishments-system"

That's correct, this wasn't mean to go into there. If you look at the top of the merge proposal page, you'll see this:

  Merge into: lp:ubuntu-community-accomplishments

The community accomplishments code is what this change is against.

The reason that this is needed, is that the deamon code location has changed. As such, the imports in this code need to change...

review: Needs Resubmitting

[Jono Bacon (jonobacon)]

Oh I see, gotcha. I will take a look soon.

On 5 March 2012 06:21, Duncan McGreggor <email address hidden> wrote:
> Review: Resubmit
>
> Wait, so I don't understand your merge comment, Jono:
>
> "Looks like this was mean't to go into lp:ubuntu-accomplishments-system"
>
> That's correct, this wasn't mean to go into there. If you look at the top of the merge proposal page, you'll see this:
>
>  Merge into:   lp:ubuntu-community-accomplishments
>
> The community accomplishments code is what this change is against.
>
> The reason that this is needed, is that the deamon code location has changed. As such, the imports in this code need to change...
> --
> https://code.launchpad.net/~oubiwann/ubuntu-community-accomplishments/946809-module-changes/+merge/95835
> You are reviewing the proposed merge of lp:~oubiwann/ubuntu-community-accomplishments/946809-module-changes into lp:ubuntu-community-accomplishments.

--
Jono Bacon
Ubuntu Community Manager
www.ubuntu.com / www.jonobacon.org
www.identi.ca/jonobacon www.twitter.com/jonobacon

[Duncan McGreggor (oubiwann)]

For the record, Jono merged this yesterday, even though the status of the branch shows him having rejected it.

review: Approve

=== modified file 'scripts/ubuntu-community/community-council-member.py'
--- scripts/ubuntu-community/community-council-member.py	2012-02-24 00:08:50 +0000
+++ scripts/ubuntu-community/community-council-member.py	2012-03-05 03:55:20 +0000
@@ -1,35 +1,32 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
 
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
 
     if me == None:
         sys.exit(1)
     else:
         user = me.name
-
         teams = [team.name for team in lp.people['communitycouncil'].sub_teams]
-
         if teams == []:
             teams.append(lp.people['communitycouncil'].name)
-
         try:
             memberships = [
                 membership for membership in
@@ -38,7 +35,6 @@
                     ['communitycouncil'] + teams]
         except KeyError:
             memberships = []
-
         if memberships:
             sys.exit(0)
         else:
@@ -49,4 +45,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/core-dev.py'
--- scripts/ubuntu-community/core-dev.py	2012-02-21 03:39:06 +0000
+++ scripts/ubuntu-community/core-dev.py	2012-03-05 03:55:20 +0000
@@ -1,35 +1,32 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
 
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
 
     if me == None:
         sys.exit(1)
     else:
         user = me.name
-        
         teams = [team.name for team in lp.people['ubuntu-core-dev'].sub_teams]
-
         if teams == []:
             teams.append(lp.people['ubuntu-core-dev'].name)
-
         try:
             memberships = [
                 membership for membership in
@@ -38,7 +35,6 @@
                     ['ubuntu-core-dev'] + teams]
         except KeyError:
             memberships = []
-
         if memberships:
             sys.exit(0)
         else:
@@ -49,4 +45,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/first-bug-confirmed.py'
--- scripts/ubuntu-community/first-bug-confirmed.py	2012-03-02 14:14:47 +0000
+++ scripts/ubuntu-community/first-bug-confirmed.py	2012-03-05 03:55:20 +0000
@@ -1,34 +1,33 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
 
-    # Get count of bugs reported by user from Launchpad, using email to identify
-    l=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=l.people.getByEmail(email=email)
-
+    # Get count of bugs reported by user from Launchpad, using email to
+    # identify
+    l = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = l.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
         ubuntu=l.projects['ubuntu']
         bugs_reported = ubuntu.searchTasks(bug_reporter=me, 
-            status=['Confirmed', 'Triaged', 
-            'In Progress', 'Fix Committed', 'Fix Released'])
-
+            status=['Confirmed', 'Triaged', 'In Progress', 'Fix Committed',
+                    'Fix Released'])
         if len(bugs_reported) > 0:
             sys.exit(0)
         else:
@@ -39,4 +38,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/first-bug.py'
--- scripts/ubuntu-community/first-bug.py	2012-02-18 00:01:46 +0000
+++ scripts/ubuntu-community/first-bug.py	2012-03-05 03:55:20 +0000
@@ -1,34 +1,34 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
 
-    # Get count of bugs reported by user from Launchpad, using email to identify
-    l=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=l.people.getByEmail(email=email)
-
+    # Get count of bugs reported by user from Launchpad, using email to
+    # identify
+    l = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = l.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
         ubuntu=l.projects['ubuntu']
         bugs_reported = ubuntu.searchTasks(bug_reporter=me, 
             status=['New', 'Incomplete', 'Invalid', 'Confirmed', 'Triaged', 
-            'In Progress', 'Fix Committed', 'Fix Released', 'Opinion', "Won't Fix"])
-
+                    'In Progress', 'Fix Committed', 'Fix Released', 'Opinion',
+                    "Won't Fix"])
         if len(bugs_reported) > 0:
             sys.exit(0)
         else:
@@ -39,4 +39,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/fridge-editor.py'
--- scripts/ubuntu-community/fridge-editor.py	2012-02-22 01:10:42 +0000
+++ scripts/ubuntu-community/fridge-editor.py	2012-03-05 03:55:20 +0000
@@ -1,35 +1,31 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
 
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
-
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
         user = me.name
-
         teams = [team.name for team in lp.people['ubuntu-fridge'].sub_teams]
-
         if teams == []:
             teams.append(lp.people['ubuntu-fridge'].name)
-
         try:
             memberships = [
                 membership for membership in
@@ -38,7 +34,6 @@
                     ['ubuntu-fridge'] + teams]
         except KeyError:
             memberships = []
-
         if memberships:
             sys.exit(0)
         else:
@@ -49,4 +44,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/juju-charm-contributor.py'
--- scripts/ubuntu-community/juju-charm-contributor.py	2012-02-21 03:39:06 +0000
+++ scripts/ubuntu-community/juju-charm-contributor.py	2012-03-05 03:55:20 +0000
@@ -1,35 +1,32 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
 
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
-
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
         user = me.name
-
-        teams = [team.name for team in lp.people['charm-contributors'].sub_teams]
-
+        teams = [team.name for team in
+                 lp.people['charm-contributors'].sub_teams]
         if teams == []:
             teams.append(lp.people['charm-contributors'].name)
-
         try:
             memberships = [
                 membership for membership in
@@ -38,7 +35,6 @@
                     ['charm-contributors'] + teams]
         except KeyError:
             memberships = []
-
         if memberships:
             sys.exit(0)
         else:
@@ -49,4 +45,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/juju-charm-reviewer.py'
--- scripts/ubuntu-community/juju-charm-reviewer.py	2012-02-21 03:39:06 +0000
+++ scripts/ubuntu-community/juju-charm-reviewer.py	2012-03-05 03:55:20 +0000
@@ -1,35 +1,30 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
-
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
-
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
         user = me.name
-
         teams = [team.name for team in lp.people['charmers'].sub_teams]
-
         if teams == []:
             teams.append(lp.people['charmers'].name)
-
         try:
             memberships = [
                 membership for membership in
@@ -38,7 +33,6 @@
                     ['charmers'] + teams]
         except KeyError:
             memberships = []
-
         if memberships:
             sys.exit(0)
         else:
@@ -49,4 +43,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/loco-council-member.py'
--- scripts/ubuntu-community/loco-council-member.py	2012-02-24 00:08:50 +0000
+++ scripts/ubuntu-community/loco-council-member.py	2012-03-05 03:55:20 +0000
@@ -1,35 +1,31 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
-
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
-
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
         user = me.name
-
-        teams = [team.name for team in lp.people['ubuntu-lococouncil'].sub_teams]
-
+        teams = [team.name for team in
+                 lp.people['ubuntu-lococouncil'].sub_teams]
         if teams == []:
             teams.append(lp.people['ubuntu-lococouncil'].name)
-
         try:
             memberships = [
                 membership for membership in
@@ -38,7 +34,6 @@
                     ['ubuntu-lococouncil'] + teams]
         except KeyError:
             memberships = []
-
         if memberships:
             sys.exit(0)
         else:
@@ -49,4 +44,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/member-loco-team.py'
--- scripts/ubuntu-community/member-loco-team.py	2012-02-23 06:57:16 +0000
+++ scripts/ubuntu-community/member-loco-team.py	2012-03-05 03:55:20 +0000
@@ -1,25 +1,23 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(2)
     else:
         email = f[0]["launchpad-email"]
-
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
-
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
@@ -29,15 +27,13 @@
             for sup in team.super_teams:
                 if "locoteams" in sup.self_link.rsplit('~', 1)[-1]:
                     final.append(sup)
-
         if len(final) is not 0:
             sys.exit(0)
         else:
             sys.exit(1)
-            
+
 except SystemExit, e:
     sys.exit(e.code)
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/motu.py'
--- scripts/ubuntu-community/motu.py	2012-02-21 03:39:06 +0000
+++ scripts/ubuntu-community/motu.py	2012-03-05 03:55:20 +0000
@@ -1,35 +1,30 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
-
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
-
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
         user = me.name
-
         teams = [team.name for team in lp.people['motu'].sub_teams]
-
         if teams == []:
             teams.append(lp.people['motu'].name)
-
         try:
             memberships = [
                 membership for membership in
@@ -38,7 +33,6 @@
                     ['motu'] + teams]
         except KeyError:
             memberships = []
-
         if memberships:
             sys.exit(0)
         else:
@@ -49,4 +43,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/registered-on-launchpad.py'
--- scripts/ubuntu-community/registered-on-launchpad.py	2012-02-15 22:14:37 +0000
+++ scripts/ubuntu-community/registered-on-launchpad.py	2012-03-05 03:55:20 +0000
@@ -1,26 +1,25 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
-
-    # Get count of bugs reported by user from Launchpad, using email to identify
-    l=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=l.people.getByEmail(email=email)
-
+    # Get count of bugs reported by user from Launchpad, using email to
+    # identify
+    l = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = l.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
@@ -31,4 +30,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/signed-code-of-conduct.py'
--- scripts/ubuntu-community/signed-code-of-conduct.py	2012-02-23 23:42:28 +0000
+++ scripts/ubuntu-community/signed-code-of-conduct.py	2012-03-05 03:55:20 +0000
@@ -1,25 +1,23 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
-
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
-
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
@@ -33,4 +31,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/technical-board-member.py'
--- scripts/ubuntu-community/technical-board-member.py	2012-02-24 00:08:50 +0000
+++ scripts/ubuntu-community/technical-board-member.py	2012-03-05 03:55:20 +0000
@@ -1,35 +1,30 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
-
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
-
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
         user = me.name
-
         teams = [team.name for team in lp.people['techboard'].sub_teams]
-
         if teams == []:
             teams.append(lp.people['techboard'].name)
-
         try:
             memberships = [
                 membership for membership in
@@ -38,7 +33,6 @@
                     ['techboard'] + teams]
         except KeyError:
             memberships = []
-
         if memberships:
             sys.exit(0)
         else:
@@ -49,4 +43,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-

=== modified file 'scripts/ubuntu-community/ubuntu-member.py'
--- scripts/ubuntu-community/ubuntu-member.py	2012-02-21 03:39:06 +0000
+++ scripts/ubuntu-community/ubuntu-member.py	2012-03-05 03:55:20 +0000
@@ -1,35 +1,30 @@
 #!/usr/bin/python
-
 import traceback, sys
-import libaccomplishments
+
+from accomplishments.daemon import dbusapi
+
 
 try:
     import json, sys, os, pwd, subprocess
     from ubuntuone.couch import auth
     from launchpadlib.launchpad import Launchpad
 
-    libaccom = libaccomplishments.Accomplishments()
-
-    f = libaccom.getExtraInformation("ubuntu-community", "launchpad-email")
-
+    api = dbusapi.Accomplishments()
+    f = api.getExtraInformation("ubuntu-community", "launchpad-email")
     if bool(f[0]["launchpad-email"]) == False:
         sys.exit(4)
     else:
         email = f[0]["launchpad-email"]
-
-    lp=Launchpad.login_anonymously('ubuntu-community accomplishments','production')
-    me=lp.people.getByEmail(email=email)
-
+    lp = Launchpad.login_anonymously(
+        'ubuntu-community accomplishments', 'production')
+    me = lp.people.getByEmail(email=email)
     if me == None:
         sys.exit(1)
     else:
         user = me.name
-
         teams = [team.name for team in lp.people['ubuntumembers'].sub_teams]
-
         if teams == []:
             teams.append(lp.people['ubuntumembers'].name)
-
         try:
             memberships = [
                 membership for membership in
@@ -38,7 +33,6 @@
                     ['ubuntumembers'] + teams]
         except KeyError:
             memberships = []
-
         if memberships:
             sys.exit(0)
         else:
@@ -49,4 +43,3 @@
 except:
     traceback.print_exc()
     sys.exit(2)
-