Merge pull request #8 from neldredge/master

With --testnet, look for testnet directory in the right place

pywallet.py

@@ -4986,10 +4986,6 @@ if __name__ == '__main__':
 		parser.print_help()
 		exit(0)
 
-	if options.testnet:
-		db_dir += "/testnet"
-		addrtype = 111
-
 	if options.namecoin or options.otherversion is not None:
 		if options.datadir is None and options.keyinfo is None:
 			print("You must provide your wallet directory")
@@ -5007,6 +5003,10 @@ if __name__ == '__main__':
 
 	db_dir = determine_db_dir()
 
+	if options.testnet:
+		db_dir += "/testnet3"
+		addrtype = 111
+
 	db_env = create_env(db_dir)
 
 	if options.multidelete is not None: