[Nym3-commit] r320 - in trunk/nymbaron: . Client Server
jr at conuropsis.org
jr at conuropsis.org
Fri Oct 7 21:05:11 CEST 2005
Author: jr
Date: 2005-10-07 21:05:08 +0200 (Fri, 07 Oct 2005)
New Revision: 320
Modified:
trunk/nymbaron/Client/Account.py
trunk/nymbaron/Client/Config.py
trunk/nymbaron/Client/Keyring.py
trunk/nymbaron/Client/Main.py
trunk/nymbaron/Client/testcurses.py
trunk/nymbaron/Common.py
trunk/nymbaron/Crypto.py
trunk/nymbaron/Mail.py
trunk/nymbaron/Message.py
trunk/nymbaron/Server/Config.py
trunk/nymbaron/Server/Main.py
trunk/nymbaron/Server/User.py
Log:
replace reference to nym3 by reference to nymbaron (package name and constants)
Modified: trunk/nymbaron/Client/Account.py
===================================================================
--- trunk/nymbaron/Client/Account.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Client/Account.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -22,7 +22,7 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Client.Acount
+"""nymbaron.Client.Acount
This package contains user account information representation on the client
side and ways to create, access to and modify them."""
@@ -305,7 +305,7 @@
def get_admPubKey(self):
pubring = Keyring.Keyring(self.config.pubring_path, create = False)
- pubring.decrypt("nym3")
+ pubring.decrypt("nymbaron")
return pubring.get_key(self['admKey'])
def record(self, seqno, msg):
Modified: trunk/nymbaron/Client/Config.py
===================================================================
--- trunk/nymbaron/Client/Config.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Client/Config.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -31,7 +31,7 @@
# through mixminion or output them on stdout
self.DEBUG = False
#The path to the directory containing the user accounts
- self.path = os.environ['HOME'] + '/.nym3-account'
+ self.path = os.environ['HOME'] + '/.nymbaron-account'
self.pubring_path = self.path + os.sep + "pubring"
self.secring_path = self.path + os.sep + "secring"
Modified: trunk/nymbaron/Client/Keyring.py
===================================================================
--- trunk/nymbaron/Client/Keyring.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Client/Keyring.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -23,7 +23,7 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Client.KeyRing
+"""nymbaron.Client.KeyRing
This package contains the implementation of a Keyring designed to store
keys in files protected by a password and to easily access those keys."""
Modified: trunk/nymbaron/Client/Main.py
===================================================================
--- trunk/nymbaron/Client/Main.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Client/Main.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -23,9 +23,10 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Client.Main
+"""nymbaron.Client.Main
- This package contains the implementation of a nym3 command line client."""
+ This package contains the implementation of a nymbaron command line
+ client."""
import sys
import os
@@ -47,7 +48,7 @@
import mixminion.ClientDirectory as _cl
import tempfile
-usage_string = """Usage: nym3 <command> [arguments]
+usage_string = """Usage: nymbaron <command> [arguments]
where <command> is one of:
\tcreate\t\tCreate a new account
\tsend\t\tSend an anonymous mail with your nym
@@ -341,7 +342,7 @@
secring = None
try:
pubring = Keyring.Keyring(config.pubring_path, create = True)
- pubring.decrypt("nym3")
+ pubring.decrypt("nymbaron")
except: pass
try:
secring = Keyring.Keyring(config.secring_path)
@@ -372,7 +373,7 @@
pubring.update_key(enctag, _cr.pk_encode_public_key(encKey))
pubring.update_key(admtag, _cr.pk_encode_public_key(admKey))
secring.save(passphrase1)
- pubring.save("nym3")
+ pubring.save("nymbaron")
createc = Message.Create()
createc.fromData(usernamelist, "")
newpkc = Message.Newpk()
@@ -841,7 +842,9 @@
sys.exit(0)
if args[1] == "resend-command":
- parser = OptionParser()
+ parser = OptionParser(usage = """A command to resend can be refered
+ as journal:N, where N is the index of the command given by
+ list-journal""")
parser.add_option("-n", "--nickname", action = "store",
dest = "nickname", help = "The nickname "
"of the account whose emails to request")
Modified: trunk/nymbaron/Client/testcurses.py
===================================================================
--- trunk/nymbaron/Client/testcurses.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Client/testcurses.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -22,10 +22,10 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Client.testcurses
+"""nymbaron.Client.testcurses
- This package contains an attempt at writing a curses based nym3 interface.
- It is not working for now, but may be adapted in the future."""
+ This package contains an attempt at writing a curses based nymbaron
+ interface. It is not working for now, but may be adapted in the future."""
import curses
import curses.wrapper
Modified: trunk/nymbaron/Common.py
===================================================================
--- trunk/nymbaron/Common.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Common.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -23,7 +23,7 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Common
+"""nymbaron.Common
This packages contains constants used by both the server and our client."""
Modified: trunk/nymbaron/Crypto.py
===================================================================
--- trunk/nymbaron/Crypto.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Crypto.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -23,7 +23,7 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Crypto
+"""nymbaron.Crypto
This package contains all the specific cryptographic primitives defined
in Nym spec."""
Modified: trunk/nymbaron/Mail.py
===================================================================
--- trunk/nymbaron/Mail.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Mail.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -22,7 +22,7 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Mail
+"""nymbaron.Mail
This package contains utilities to process mails."""
Modified: trunk/nymbaron/Message.py
===================================================================
--- trunk/nymbaron/Message.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Message.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -24,7 +24,7 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Message
+"""nymbaron.Message
This module contains representations of the message of the nym protocol
and methods to parse and generate messages from these representations."""
Modified: trunk/nymbaron/Server/Config.py
===================================================================
--- trunk/nymbaron/Server/Config.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Server/Config.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -23,12 +23,12 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Server.Config
+"""nymbaron.Server.Config
This package is the configuration file of the server."""
__all__ = ['DEBUG', "serverName", "path", "default_settings"]
-#path = '/var/lib/nym3'
+#path = '/var/lib/nymbaron'
DEBUG = False
"""Whether the server sends the message it generates to mixminion
Modified: trunk/nymbaron/Server/Main.py
===================================================================
--- trunk/nymbaron/Server/Main.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Server/Main.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -24,9 +24,9 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Server.Main
+"""nymbaron.Server.Main
- This package contains an implementation of a nym3 server."""
+ This package contains an implementation of a nymbaron server."""
import sys
import os
Modified: trunk/nymbaron/Server/User.py
===================================================================
--- trunk/nymbaron/Server/User.py 2005-10-06 17:15:10 UTC (rev 319)
+++ trunk/nymbaron/Server/User.py 2005-10-07 19:05:08 UTC (rev 320)
@@ -23,7 +23,7 @@
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-"""nym3.Server.User
+"""nymbaron.Server.User
This module contains methods of storing, accessing and editing user account
information."""
More information about the Nym3-commit
mailing list