follow the latest spec of atwiki backup URL

Author: kmaehashi

atwiki/test/test_core.py

@@ -34,7 +34,7 @@ def test_get_tags(self):
   def test_get_source(self):
     self.assertEqual(self._api.get_source(14, 0),
                      'テスト1\nテスト2\n\nテスト3\nテスト4\n\n\nテスト5')
-    self.assertEqual(self._api.get_source(14, 1),
+    self.assertEqual(self._api.get_source(14, 3),
                      'テスト1\nテスト2\n\nテスト3\nテスト4')
 
   def test_get_source_special(self):

atwiki/test/test_uri.py

@@ -18,7 +18,7 @@ def test_path_input(self):
     uri = AtWikiURI(base)
 
     self.assertEqual(uri.get_page_id_from_uri('{0}/backupx/123/list.html'.format(base)), 123)
-    self.assertEqual(uri.get_page_id_from_uri('{0}/?cmd=backup&action=show&pageid=456&num=1'.format(base)), 456)
+    self.assertEqual(uri.get_page_id_from_uri('{0}/?cmd=backup&action=show&pageid=456&num=0'.format(base)), 456)
     self.assertEqual(uri.get_page_id_from_uri('{0}/pages/789.html'.format(base)), 789)
 
   def test_path_output(self):
@@ -43,10 +43,10 @@ def test_path_output(self):
 
     self.assertEqual(uri.backup_list(), '{0}/?cmd=backup&action=list'.format(base))
     self.assertEqual(uri.backup_list(10), '{0}/?cmd=backup&action=list&pageid=10'.format(base))
-    self.assertEqual(uri.backup_source(10, 1), '{0}/?cmd=backup&action=source&pageid=10&num=1'.format(base))
-    self.assertEqual(uri.backup_show(10, 1), '{0}/?cmd=backup&action=show&pageid=10&num=1'.format(base))
-    self.assertEqual(uri.backup_diff(10, 1), '{0}/?cmd=backup&action=diff&pageid=10&num=1'.format(base))
-    self.assertEqual(uri.backup_nowdiff(10, 1), '{0}/?cmd=backup&action=nowdiff&pageid=10&num=1'.format(base))
+    self.assertEqual(uri.backup_source(10, 1), '{0}/?cmd=backup&action=source&pageid=10&id=1'.format(base))
+    self.assertEqual(uri.backup_show(10, 1), '{0}/?cmd=backup&action=show&pageid=10&id=1'.format(base))
+    self.assertEqual(uri.backup_diff(10, 1), '{0}/?cmd=backup&action=diff&pageid=10&id=1'.format(base))
+    self.assertEqual(uri.backup_nowdiff(10, 1), '{0}/?cmd=backup&action=nowdiff&pageid=10&id=1'.format(base))
 
     self.assertEqual(uri.page(10), '{0}/pages/10.html'.format(base))
     self.assertEqual(uri.diff(10), '{0}/diffx/10.html'.format(base))

atwiki/uri.py

@@ -98,7 +98,7 @@ def _backup(self, action, page_id=None, generation=None):
     if page_id is not None:
       url += '&pageid={0}'.format(page_id)
     if generation is not None:
-      url += '&num={0}'.format(generation)
+      url += '&id={0}'.format(generation)
     return url
 
   def backup_list(self, page_id=None):