~cmiller/desktopcouch/proxy-for-consistent-port

« back to all changes in this revision

Viewing changes to desktopcouch/local_files.py

  • Committer: Chad Miller
  • Date: 2010-11-16 16:52:20 UTC
  • mfrom: (199.2.10 desktopcouch)
  • Revision ID: chad.miller@canonical.com-20101116165220-9x141o0vkr7cg2s7
Update microproxy branch with merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
281
281
        os.path.join(xdg_base_dirs.xdg_cache_home, "desktop-couch"),
282
282
        xdg_base_dirs.save_data_path("desktop-couch"),
283
283
        xdg_base_dirs.save_config_path("desktop-couch"),
284
 
        keyring=Keyring)
 
284
        keyring=Keyring())
285
285
 
286
286
def get_admin_credentials(ctx=DEFAULT_CONTEXT):
287
287
    return ctx.configuration.items_in_section("admins")[0]  # return first tuple