[#7114] Don't hardcode nbhd prefix
Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
diff --git a/Allura/allura/lib/import_api.py b/Allura/allura/lib/import_api.py
index 9e383b5..d8159c5 100644
--- a/Allura/allura/lib/import_api.py
+++ b/Allura/allura/lib/import_api.py
@@ -57,6 +57,7 @@
resp = result.read()
return json.loads(resp)
except urllib2.HTTPError, e:
+ e.msg += ' ({0})'.format(url)
if self.verbose:
error_content = e.read()
e.msg += '. Error response:\n' + error_content
diff --git a/ForgeTracker/forgetracker/scripts/import_tracker.py b/ForgeTracker/forgetracker/scripts/import_tracker.py
index ba8e93f..965fafa 100644
--- a/ForgeTracker/forgetracker/scripts/import_tracker.py
+++ b/ForgeTracker/forgetracker/scripts/import_tracker.py
@@ -28,7 +28,12 @@
def import_tracker(cli, project, tool, import_options, doc_txt,
validate=True, verbose=False, cont=False):
- url = '/rest/p/' + project + '/' + tool
+ from allura import model as M
+ p = M.Project.query.get(shortname=project)
+ url = '/rest/{project_url}/{tool}'.format(
+ project_url=p.url().strip('/'),
+ tool=tool,
+ )
if validate:
url += '/validate_import'
else:
@@ -36,8 +41,7 @@
existing_map = {}
if cont:
- existing_tickets = cli.call(
- '/rest/p/' + project + '/' + tool + '/')['tickets']
+ existing_tickets = cli.call(url + '/')['tickets']
for t in existing_tickets:
existing_map[t['ticket_num']] = t['summary']
diff --git a/scripts/allura_import.py b/scripts/allura_import.py
index 56bc5d5..63d14f1 100644
--- a/scripts/allura_import.py
+++ b/scripts/allura_import.py
@@ -70,7 +70,12 @@
def import_forum(cli, project, tool, user_map, doc_txt, validate=True):
- url = '/rest/p/' + project + '/' + tool
+ from allura import model as M
+ p = M.Project.query.get(shortname=project)
+ url = '/rest/{project_url}/{tool}'.format(
+ project_url=p.url().strip('/'),
+ tool=tool,
+ )
if validate:
url += '/validate_import'
print cli.call(url, doc=doc_txt, user_map=json.dumps(user_map))
