Merge branch 'master' of https://github.com/pwman3/pwman3

pwman/data/convertdb.py

@@ -29,7 +29,7 @@ from pwman.data.database import Database, DatabaseException
 import sqlite3 as sqlite
 import pwman.util.config as config
 import sys
-if sys.platform_info.major > 2:
+if sys.version_info.major > 2:
     import pickle as cPickle
 else:
     import cPickle

pwman/ui/tools.py

@@ -43,7 +43,8 @@ if sys.platform != 'win32':
     _readline_available = True
 else:  # pragma: no cover
     try:
-        import pyreadline as readline
+        #import pyreadline as readline
+        import readline
         _readline_available = True
     except ImportError as e:
         _readline_available = False

pwman/ui/win.py

@@ -75,7 +75,11 @@ class PwmanCliWinNew(PwmanCliNew):
                                              special_signs=special_chars)
             url = self.get_url()
             notes = self.get_notes()
-            node = NewNode(username, password, url, notes)
+            node = NewNode()
+            node.username = username
+            node.password = password
+            node.url = url
+            node.notes = notes
             tags = self.get_tags()
             node.tags = tags
             self._db.addnodes([node])