Ubuntu Single Sign On Client

Merge lp:~ralsina/ubuntu-sso-client/fix-setup into lp:ubuntu-sso-client

  1. fix-setup
  2. Merge into trunk
Proposed by Roberto Alsina
Status: Merged
Approved by: Roberto Alsina
Approved revision: 767
Merge reported by: Roberto Alsina
Merged at revision: not available
Proposed branch: lp:~ralsina/ubuntu-sso-client/fix-setup
Merge into: lp:ubuntu-sso-client
Diff against target: 59 lines (+8/-15)
3 files modified
setup.py (+8/-3)
ubuntu_sso/xdg_base_directory/__init__.py (+0/-5)
ubuntu_sso/xdg_base_directory/tests/test_common.py (+0/-7)
To merge this branch: bzr merge lp:~ralsina/ubuntu-sso-client/fix-setup
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Natalia Bidart (community) Approve
Review via email: mp+72707@code.launchpad.net

Commit message

* package xdg_base_directory
* remove ubuntuone_log_dir (it will stay in u1-client)

Description of the change

* package xdg_base_directory
* remove ubuntuone_log_dir (it will stay in u1-client)

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

== Python Lint Notices ==

ubuntu_sso/xdg_base_directory/__init__.py:
    19: [W0611] Unused import os

review: Needs Fixing
lp:~ralsina/ubuntu-sso-client/fix-setup updated
767. By Roberto Alsina

removed unused import

Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good!

review: Approve
Revision history for this message
Manuel de la Peña (mandel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2011-08-02 15:48:15 +0000
3+++ setup.py 2011-08-24 13:11:46 +0000
4@@ -371,9 +371,14 @@
5 extra_path='ubuntu-sso-client',
6 data_files=data_files,
7 packages=[
8- 'ubuntu_sso', 'ubuntu_sso.utils', 'ubuntu_sso.keyring',
9- 'ubuntu_sso.networkstate', 'ubuntu_sso.main',
10- 'ubuntu_sso.gtk', 'ubuntu_sso.qt',
11+ 'ubuntu_sso',
12+ 'ubuntu_sso.utils',
13+ 'ubuntu_sso.keyring',
14+ 'ubuntu_sso.networkstate',
15+ 'ubuntu_sso.main',
16+ 'ubuntu_sso.gtk',
17+ 'ubuntu_sso.qt',
18+ 'ubuntu_sso.xdg_base_directory',
19 ],
20 cmdclass=cmdclass,
21 **extra)
22
23=== modified file 'ubuntu_sso/xdg_base_directory/__init__.py'
24--- ubuntu_sso/xdg_base_directory/__init__.py 2011-08-23 15:40:50 +0000
25+++ ubuntu_sso/xdg_base_directory/__init__.py 2011-08-24 13:11:46 +0000
26@@ -16,7 +16,6 @@
27
28 """XDG multiplatform."""
29
30-import os
31 import sys
32
33 # pylint: disable=C0103
34@@ -34,7 +33,3 @@
35 xdg_cache_home = xdg.BaseDirectory.xdg_cache_home
36 xdg_data_home = xdg.BaseDirectory.xdg_data_home
37 xdg_data_dirs = xdg.BaseDirectory.xdg_data_dirs
38-
39-ubuntuone_log_dir = os.path.join(xdg_cache_home, 'ubuntuone', 'log')
40-if not os.path.exists(ubuntuone_log_dir):
41- os.makedirs(ubuntuone_log_dir)
42
43=== modified file 'ubuntu_sso/xdg_base_directory/tests/test_common.py'
44--- ubuntu_sso/xdg_base_directory/tests/test_common.py 2011-08-23 14:24:27 +0000
45+++ ubuntu_sso/xdg_base_directory/tests/test_common.py 2011-08-24 13:11:46 +0000
46@@ -28,13 +28,6 @@
47 class TestBaseDirectory(TestCase):
48 """Tests for the BaseDirectory module."""
49
50- def test_ubuntuone_log_dir(self):
51- """The ubuntuone_log_dir is correct."""
52- expected = os.path.join(xdg_base_directory.xdg_cache_home,
53- 'ubuntuone', 'log')
54- self.assertEqual(expected, xdg_base_directory.ubuntuone_log_dir)
55- self.assertTrue(os.path.exists(expected))
56-
57 def test_xdg_cache_home_is_bytes(self):
58 """The returned path is bytes."""
59 actual = xdg_base_directory.xdg_cache_home

Subscribers

People subscribed via source and target branches