diff --git a/README.rst b/README.rst
index f16955ce811bfdb81980eb14ac74f65ee4c600d6..0836bca9de5d4248cf406077248f3b2519b474cb 100644
--- a/README.rst
+++ b/README.rst
@@ -8,7 +8,15 @@ requires Python 2.4 and supports MediaWiki 1.11 and above.
For functions not available in the current MediaWiki, a ``MediaWikiVersionError`` is raised.
This framework was written by Bryan Tong Minh, who released the latest stable
-`version 0.6.5 <//github.com/mwclient/mwclient/archive/REL_0_6_5.zip>`_ on 6 May 2011.
+`version 0.6.5 <//github.com/mwclient/mwclient/archive/REL_0_6_5.zip>`_
+on 6 May 2011. Version 0.6.5 is also
+`available through PyPI <//pypi.python.org/pypi/mwclient/0.6.5>`_:
+
+.. code-block:: console
+
+ $ pip install mwclient
+
+Note that 0.6.5 might not work with the latest MediaWiki versions.
The current `development version <//github.com/mwclient/mwclient>`_
can be installed directly off github:
@@ -16,7 +24,8 @@ can be installed directly off github:
$ pip install git+git://github.com/mwclient/mwclient.git
-Please see the `release notes <//github.com/mwclient/mwclient/blob/master/RELEASE-NOTES.md>`_
+Please see the
+`release notes <//github.com/mwclient/mwclient/blob/master/RELEASE-NOTES.md>`_
for a list of changes.
Contributing
@@ -83,7 +92,9 @@ Example
-------
For more information, see the
-`REFERENCE.md <//github.com/mwclient/mwclient/blob/master/REFERENCE.md>`_ file.
+`REFERENCE.md <//github.com/mwclient/mwclient/blob/master/REFERENCE.md>`_ file
+or the
+`documentation on the wiki <//github.com/mwclient/mwclient/wiki>`_.
.. code-block:: python
diff --git a/REFERENCE.md b/REFERENCE.md
index 0352d3c5a2ae90c0c21ed0ae06952ede3e9617ec..b0eaedcb288513021be962b7e159a88d415ee64c 100644
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -1,7 +1,7 @@
This file is intended to be a reference to mwclient.
-The current version is mwclient 0.6.6.
+The current version is mwclient 0.6.5.
-The mwclient framework provides an access to the MediaWiki API.
+The mwclient framework provides access to the MediaWiki API.
It provides the functions of the MediaWiki API in a Pythonic manner.
## Sites ##
@@ -13,10 +13,14 @@ They represent respectively
the hostname without protocol
and the root directory where `api.php` is located.
The path parameter should end with a slash, /.
-Protocols other than HTTP are currently not supported.
+Protocols other than HTTP and HTTPS are currently not supported.
```python
+#http
site = mwclient.Site(host, path = '/w/', ...)
+
+#https
+site = mwclient.Site(('https', host), path = '/w/', ...)
```
### Pages ###
@@ -44,15 +48,16 @@ In addition to the page properties listed in the API documentation,
also the lists backlinks and embedded in are members of the Page object. For more information about using generators
see the section on generators below.
-`Category` objects provide an extra property members
+`Category` objects provide an extra function, `members`
to list all members of a category.
The Category object can also be used itself
as an iterator yielding all its members.
```python
+#list pages in Category:Help by name
category = site.Pages['Category:Help']
for page in category:
- print category
+ print page.name
```
`Image` objects have additional functions `imagehistory` and `imageusage`
@@ -70,7 +75,7 @@ fr.close() # Always close those file objects !!!
fw.close()
```
-#### Editting pages ####
+#### Editing pages ####
Call `Page.edit()` to retrieve the page content.
Use `Page.save(text, summary = u'', ...)` to save the page.
If available, `Page.save` uses the API to edit,
@@ -82,7 +87,7 @@ but falls back to the old way if the write API is not available.
## Implementation notes ##
Most properties and generators accept the same parameters as the API,
-without their two letter prefix.
+without their two-letter prefix.
Exceptions:
* `Image.imageinfo` is the `imageinfo` of the *latest* image.
Earlier versions can be fetched using `imagehistory()`
@@ -105,4 +110,6 @@ Default chunk size is generally the maximum chunk size.
## Links ##
* Project page at GitHub: https://github.com/mwclient/mwclient
+* More in-depth documentation on the GitHub wiki:
+https://github.com/mwclient/mwclient/wiki
* MediaWiki API documentation: https://mediawiki.org/wiki/API
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index ff890d324d26024a7e46042924a11e867336a6d3..3919cfad060b6617b9e189e134885e82740777ac 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,90 +1,110 @@
# Release Notes for mwclient
## Changes in version 0.7
-* [2012-08-30] Allow setting both the upload description and the page content separately
- (by [@btongminh](https://github.com/btongminh))
- [0aa748f](https://github.com/btongminh/mwclient/commit/0aa748f)
-* [2012-08-30] Improve documentation
- (by [@tommorris](https://github.com/tommorris))
- [a2723e7](https://github.com/btongminh/mwclient/commit/a2723e7)
-* [2013-02-15] Converted the repository to git and moved from sourceforge to github
- (by [@waldir](https://github.com/waldir))
+This is the development version of mwclient.
+* [2012-08-30] [@btongminh](https://github.com/btongminh):
+ Allow setting both the upload description and the page content separately.
+ [0aa748f](https://github.com/btongminh/mwclient/commit/0aa748f).
+* [2012-08-30] [@tommorris](https://github.com/tommorris):
+ Improve documentation.
+ [a2723e7](https://github.com/btongminh/mwclient/commit/a2723e7).
+* [2013-02-15] [@waldir](https://github.com/waldir):
+ Converted the repository to git and moved from sourceforge to github.
[#1](https://github.com/btongminh/mwclient/issues/1) (also
[#11](https://github.com/btongminh/mwclient/issues/11),
[#13](https://github.com/btongminh/mwclient/issues/13) and
- [#15](https://github.com/btongminh/mwclient/issues/15))
-* [2013-03-20] Support for customising the useragent
- (by [@eug48](https://github.com/eug48))
+ [#15](https://github.com/btongminh/mwclient/issues/15)).
+* [2013-03-20] [@eug48](https://github.com/eug48):
+ Support for customising the useragent.
[773adf9](https://github.com/btongminh/mwclient/commit/773adf9),
- [#16](https://github.com/btongminh/mwclient/pull/16)
-* [2013-03-20] Removed unused 'Request' class
- (by [@eug48](https://github.com/eug48))
+ [#16](https://github.com/btongminh/mwclient/pull/16).
+* [2013-03-20] [@eug48](https://github.com/eug48):
+ Removed unused 'Request' class.
[99e786d](https://github.com/btongminh/mwclient/commit/99e786d),
- [#16](https://github.com/btongminh/mwclient/pull/16)
-* [2013-05-13] Support for requesting pages by their page id (`site.pages[page_id]`)
- (by [@danmichaelo](https://github.com/danmichaelo))
+ [#16](https://github.com/btongminh/mwclient/pull/16).
+* [2013-05-13] [@danmichaelo](https://github.com/danmichaelo):
+ Support for requesting pages by their page id (`site.pages[page_id]`).
[a1a2ced](https://github.com/danmichaelo/mwclient/commit/a1a2ced),
- [#19](https://github.com/btongminh/mwclient/pull/19)
-* [2013-05-13] Support for editing sections
- (by [@danmichaelo](https://github.com/danmichaelo))
+ [#19](https://github.com/btongminh/mwclient/pull/19).
+* [2013-05-13] [@danmichaelo](https://github.com/danmichaelo):
+ Support for editing sections.
[546f77d](https://github.com/danmichaelo/mwclient/commit/546f77d),
- [#19](https://github.com/btongminh/mwclient/pull/19)
-* [2013-05-13] New method `Page.redirects_to()` and helper method `Page.resolve_redirect()`
- (by [@danmichaelo](https://github.com/danmichaelo))
+ [#19](https://github.com/btongminh/mwclient/pull/19).
+* [2013-05-13] [@danmichaelo](https://github.com/danmichaelo):
+ New method `Page.redirects_to()` and helper method `Page.resolve_redirect()`.
[3b851cb](https://github.com/danmichaelo/mwclient/commit/3b851cb),
[36e8dcc](https://github.com/danmichaelo/mwclient/commit/36e8dcc),
- [#19](https://github.com/btongminh/mwclient/pull/19)
-* [2013-05-13] Support argument `action` with `logevents()`
- (by [@danmichaelo](https://github.com/danmichaelo))
+ [#19](https://github.com/btongminh/mwclient/pull/19).
+* [2013-05-13] [@danmichaelo](https://github.com/danmichaelo):
+ Support argument `action` with `logevents()`.
[241ed37](https://github.com/danmichaelo/mwclient/commit/241ed37),
- [#19](https://github.com/btongminh/mwclient/pull/19)
-* [2013-05-13] Support argument `page` with `parse()`
- (by [@danmichaelo](https://github.com/danmichaelo))
+ [#19](https://github.com/btongminh/mwclient/pull/19).
+* [2013-05-13] [@danmichaelo](https://github.com/danmichaelo):
+ Support argument `page` with `parse()`.
[223aa0](https://github.com/danmichaelo/mwclient/commit/223aa0),
- [#19](https://github.com/btongminh/mwclient/pull/19)
-* [2013-11-14] Allow setting HTTP 'Authorization' header.
+ [#19](https://github.com/btongminh/mwclient/pull/19).
+* [2013-11-14] [@kyv](https://github.com/kyv):
+ Allow setting HTTP 'Authorization' header.
[HTTP headers](http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.8).
- (by [@kyv](https://github.com/kyv))
- [72fc49a](https://github.com/kyv/mwclient/commit/72fc49a)
-* [2013-11-15] Add support for the `ask` API action
+ [72fc49a](https://github.com/kyv/mwclient/commit/72fc49a).
+* [2013-11-15] [@kyv](https://github.com/kyv):
+ Add support for the `ask` API action
[provided by Semantic MediaWiki](http://semantic-mediawiki.org/wiki/Ask_API).
- (by [@kyv](https://github.com/kyv))
- [0a16afc](https://github.com/kyv/mwclient/commit/0a16afc)
-* [2014-05-02] Quickfix for [#38](https://github.com/mwclient/mwclient/issues/38)
- (by [@danmichaelo](https://github.com/danmichaelo))
- [98b850b](https://github.com/mwclient/mwclient/commit/98b850b)
-* [2014-06-13] Fix updating of Page.last_rev_time upon save(), [#41](https://github.com/mwclient/mwclient/issues/41)
- (by [@tuffnatty](https://github.com/tuffnatty))
- [d0cc7db](https://github.com/mwclient/mwclient/commit/d0cc7db)
-
-* [2014-06-13] Support more arguments to `list=allusers`, [#8](https://github.com/mwclient/mwclient/issues/8)
- (by [@jimt](https://github.com/jimt) [@danmichaelo](https://github.com/danmichaelo))
- [7cb4383](https://github.com/mwclient/mwclient/commit/7cb4383)
+ [0a16afc](https://github.com/kyv/mwclient/commit/0a16afc).
+* [2014-05-02] [@danmichaelo](https://github.com/danmichaelo):
+ Quickfix for [#38](https://github.com/mwclient/mwclient/issues/38).
+ [98b850b](https://github.com/mwclient/mwclient/commit/98b850b).
+* [2014-06-13] [@tuffnatty](https://github.com/tuffnatty):
+ Fix updating of Page.last_rev_time upon save().
+ [d0cc7db](https://github.com/mwclient/mwclient/commit/d0cc7db),
+ [#41](https://github.com/mwclient/mwclient/issues/41).
+* [2014-06-13] [@jimt](https://github.com/jimt), [@danmichaelo](https://github.com/danmichaelo):
+ Support more arguments to `list=allusers`.
+ [7cb4383](https://github.com/mwclient/mwclient/commit/7cb4383),
+ [#8](https://github.com/mwclient/mwclient/issues/8).
## Changes in version 0.6.5
-Mwclient 0.6.5 was released on 6 May 2011
-* Explicitly convert the `Content-Length` header to `str`,
+Mwclient 0.6.5 was released on 6 May 2011.
+* [2011-02-16] Fix for upload by URL.
+ [7ceb14b](https://github.com/mwclient/mwclient/commit/7ceb14b).
+* [2011-05-06] Explicitly convert the `Content-Length` header to `str`,
avoiding a `TypeError` on some versions of Python.
-* Fix for upload by URL
-* Handle `readapidenied` error in site init
-* Fix version parsing for almost any sane version string
+ [4a829bc](https://github.com/mwclient/mwclient/commit/4a829bc),
+ [2ca1fbd](https://github.com/mwclient/mwclient/commit/2ca1fbd).
+* [2011-05-06] Handle `readapidenied` error in site init.
+ [c513396](https://github.com/mwclient/mwclient/commit/c513396).
+* [2011-05-06] Fix version parsing for almost any sane version string.
+ [9f5339f](https://github.com/mwclient/mwclient/commit/9f5339f).
## Changes in version 0.6.4
-Mwclient 0.6.3 was released on 7 April 2010
-* Added support for upload API
-* Added `prop=duplicatefiles`
-* Properly fix detection of alpha versions
-* Added support for built-in JSON library
-* Handle badtoken once
-* [Bug 2690034](https://github.com/mwclient/mwclient/issues/3):
- Fix revision iteration
-* Fix module conflict with simplejson-1.x
+Mwclient 0.6.3 was released on 7 April 2010.
+* [2009-08-27] Added support for upload API.
+ [56eeb9b](https://github.com/mwclient/mwclient/commit/56eeb9b),
+ [0d7caab](https://github.com/mwclient/mwclient/commit/0d7caab) (see also
+ [610411a](https://github.com/mwclient/mwclient/commit/610411a)).
+* [2009-11-02] Added `prop=duplicatefiles`.
+ [241e5d6](https://github.com/mwclient/mwclient/commit/241e5d6)
+* [2009-11-02] Properly fix detection of alpha versions.
+ [241e5d6](https://github.com/mwclient/mwclient/commit/241e5d6)
+* [2009-11-14] Added support for built-in JSON library.
+ [73e9cd6](https://github.com/mwclient/mwclient/commit/73e9cd6)
+* [2009-11-15] Handle badtoken once.
+ [4b384e1](https://github.com/mwclient/mwclient/commit/4b384e1)
+* [2010-02-23] Fix module conflict with simplejson-1.x
by inserting mwclient path at the beginning of `sys.path`
- instead of the end
-* Supply token on login if necessary
+ instead of the end.
+ [cd37ef0](https://github.com/mwclient/mwclient/commit/cd37ef0)
+* [2010-02-23] Fix revision iteration.
+ [09b68e9](https://github.com/mwclient/mwclient/commit/09b68e9),
+ [2ad32f1](https://github.com/mwclient/mwclient/commit/2ad32f1),
+ [afdd5e8](https://github.com/mwclient/mwclient/commit/afdd5e8),
+ [993b346](https://github.com/mwclient/mwclient/commit/993b346),
+ [#3](https://github.com/mwclient/mwclient/issues/3).
+* [2010-04-07] Supply token on login if necessary.
+ [3731de5](https://github.com/mwclient/mwclient/commit/3731de5)
## Changes in version 0.6.3
-Mwclient 0.6.3 was released on 16 July 2009
+Mwclient 0.6.3 was released on 16 July 2009.
* Added domain parameter to login.
* Applied edit fix to `page_nowriteapi`
* Allow arbitrary data to be passed to `page.save`
diff --git a/mwclient/page.py b/mwclient/page.py
index 65b9a59c31421630196218f9233f627a0cf8bfc1..d053a805363b0328352d114e1791a718876c69e3 100644
--- a/mwclient/page.py
+++ b/mwclient/page.py
@@ -201,10 +201,9 @@ class Page(object):
else:
self.handle_edit_error(e, summary)
- if result['edit'].get('result') == 'Success':
- lrt = result['edit'].get('newtimestamp')
- if lrt: # It's not included if no change was made
- self.last_rev_time = client.parse_timestamp(lrt)
+ # 'newtimestamp' is not included if no change was made
+ if 'newtimestamp' in result['edit'].keys():
+ self.last_rev_time = client.parse_timestamp(result['edit'].get('newtimestamp'))
return result['edit']
def handle_edit_error(self, e, summary):