Merge lp:~cjwatson/launchpadlib/test-domain into lp:launchpadlib

Proposed by Colin Watson
Status: Merged
Merged at revision: 165
Proposed branch: lp:~cjwatson/launchpadlib/test-domain
Merge into: lp:launchpadlib
Diff against target: 83 lines (+12/-8)
5 files modified
contrib/lpapi.py (+1/-1)
src/launchpadlib/NEWS.txt (+4/-0)
src/launchpadlib/docs/command-line.txt (+1/-1)
src/launchpadlib/docs/introduction.txt (+2/-2)
src/launchpadlib/uris.py (+4/-4)
To merge this branch: bzr merge lp:~cjwatson/launchpadlib/test-domain
Reviewer Review Type Date Requested Status
Tom Wardill (community) Approve
Review via email: mp+367627@code.launchpad.net

Commit message

Change 'dev' URLs from launchpad.dev to launchpad.test.

Description of the change

We need this now that Google has bought .dev and added it to HSTS preload lists. This is in preparation for a corresponding change to Launchpad itself.

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/lpapi.py'
2--- contrib/lpapi.py 2011-01-18 22:39:28 +0000
3+++ contrib/lpapi.py 2019-05-20 08:13:40 +0000
4@@ -82,7 +82,7 @@
5
6 class Dev(LPSystem):
7 """Connection to local development version of Launchpad."""
8- endpoint = 'https://api.launchpad.dev/beta/'
9+ endpoint = 'https://api.launchpad.test/beta/'
10 auth_file_name = 'dev.auth'
11 def __init__(self, app_name='just testing'):
12 LPSystem.__init__(self, app_name=app_name, use_cache=False)
13
14=== modified file 'src/launchpadlib/NEWS.txt'
15--- src/launchpadlib/NEWS.txt 2018-03-08 11:33:52 +0000
16+++ src/launchpadlib/NEWS.txt 2019-05-20 08:13:40 +0000
17@@ -2,6 +2,10 @@
18 NEWS for launchpadlib
19 =====================
20
21+1.10.7
22+======
23+- Change 'dev' URLs from launchpad.dev to launchpad.test.
24+
25 1.10.6 (2018-03-08)
26 ===================
27 - Fix saving of credentials in python3 with gnome-keyring. [bug=1685962]
28
29=== modified file 'src/launchpadlib/docs/command-line.txt'
30--- src/launchpadlib/docs/command-line.txt 2016-07-12 16:08:43 +0000
31+++ src/launchpadlib/docs/command-line.txt 2019-05-20 08:13:40 +0000
32@@ -23,7 +23,7 @@
33 ... import simplejson as json
34 >>> from launchpadlib.apps import RequestTokenApp
35
36- >>> web_root = "http://launchpad.dev:8085/"
37+ >>> web_root = "http://launchpad.test:8085/"
38 >>> consumer_name = "consumer"
39 >>> token_app = RequestTokenApp(web_root, consumer_name, "context")
40 >>> token_json = json.loads(token_app.run())
41
42=== modified file 'src/launchpadlib/docs/introduction.txt'
43--- src/launchpadlib/docs/introduction.txt 2017-02-01 09:33:07 +0000
44+++ src/launchpadlib/docs/introduction.txt 2019-05-20 08:13:40 +0000
45@@ -230,11 +230,11 @@
46 >>> authorization_url = credentials.get_request_token(
47 ... context='firefox', web_root='test_dev')
48 >>> print(authorization_url)
49- http://launchpad.dev:8085/+authorize-token?oauth_token=...&lp.context=firefox
50+ http://launchpad.test:8085/+authorize-token?oauth_token=...&lp.context=firefox
51
52 We use 'test_dev' as a shorthand for the root URL of the Launchpad
53 installation. It's defined in the 'uris' module as
54-'http://launchpad.dev:8085/', and the launchpadlib code knows how to
55+'http://launchpad.test:8085/', and the launchpadlib code knows how to
56 dereference it before using it as a URL.
57
58 Information about the request token is kept in the _request_token
59
60=== modified file 'src/launchpadlib/uris.py'
61--- src/launchpadlib/uris.py 2014-07-03 10:44:33 +0000
62+++ src/launchpadlib/uris.py 2019-05-20 08:13:40 +0000
63@@ -37,16 +37,16 @@
64 LPNET_SERVICE_ROOT = 'https://api.launchpad.net/'
65 QASTAGING_SERVICE_ROOT = 'https://api.qastaging.launchpad.net/'
66 STAGING_SERVICE_ROOT = 'https://api.staging.launchpad.net/'
67-DEV_SERVICE_ROOT = 'https://api.launchpad.dev/'
68+DEV_SERVICE_ROOT = 'https://api.launchpad.test/'
69 DOGFOOD_SERVICE_ROOT = 'https://api.dogfood.paddev.net/'
70-TEST_DEV_SERVICE_ROOT = 'http://api.launchpad.dev:8085/'
71+TEST_DEV_SERVICE_ROOT = 'http://api.launchpad.test:8085/'
72
73 LPNET_WEB_ROOT = 'https://launchpad.net/'
74 QASTAGING_WEB_ROOT = 'https://qastaging.launchpad.net/'
75 STAGING_WEB_ROOT = 'https://staging.launchpad.net/'
76-DEV_WEB_ROOT = 'https://launchpad.dev/'
77+DEV_WEB_ROOT = 'https://launchpad.test/'
78 DOGFOOD_WEB_ROOT = 'https://dogfood.paddev.net/'
79-TEST_DEV_WEB_ROOT = 'http://launchpad.dev:8085/'
80+TEST_DEV_WEB_ROOT = 'http://launchpad.test:8085/'
81
82 # If you use EDGE_SERVICE_ROOT, or its alias, or the equivalent
83 # string, launchpadlib will issue a deprecation warning and use

Subscribers

People subscribed via source and target branches