Commits

Adam Coddington committed f1535e7 Merge

Bumping version number.

Comments (0)

Files changed (6)

 .*\.pyc
 .*egg-info.*
+dist/.*
 c4a9d1fff0bb66431a582cd93767422f377b33e6 0.2
 c89f77b8f60331e81c1a6e48d7bf94ecc6897a65 1.0
+9041cea2906864dc6b10d82e97239a9310d9c526 1.0.1
+16d62ea164318a451ae094f2a04ab5cbb5043faa 1.0.2
+59f324257bc5d6b5decf08c965db901d6c01e2da 1.0.3

django_mailbox/models.py

         new_mail = []
         for message in connection.get_message():
             msg = Message()
-            print msg
             msg.mailbox = self
             msg.subject = message['subject'][0:255]
             msg.message_id = message['message-id'][0:255]

django_mailbox/transports.py

-
 Introduction
 ~~~~~~~~~~~~
 
-How many times have you had to consume some sort of POP3 or IMAP mailbox for incoming content?  One too many times for me.
+How many times have you had to consume some sort of POP3, IMAP, or local mailbox for incoming content?  One too many times for me.
 
-This small Django application will allow you to specify IMAP or POP3 mailboxes that you would like consumed for incoming content; the e-mail will be stored, and you can process it at will (or, if you're in a hurry, by subscribing to a signal).
+This small Django application will allow you to specify mailboxes that you would like consumed for incoming content; the e-mail will be stored, and you can process it at will (or, if you're in a hurry, by subscribing to a signal).
 
-WARNING!  This app will delete any messages it can find in the inbox you specify-- please make sure you don't have anything important in there.
+WARNING!  This will delete any messages it can find in the inbox you specify-- please make sure you don't have anything important in there.
 
 Installation
 ============
 
 Django Mailbox supports both common internet mailboxes like POP3 and IMAP as well as local file-based mailboxes.
 
-.. table:: Protocol Options
+.. table:: 'Protocol' Options
 
   ============ ============== =========================================
-  Mailbox Type 'Protocol'     Notes
+  Mailbox Type 'Protocol'://  Notes
   ============ ============== =========================================
   POP3         ``pop3://``    Can also specify SSL with ``pop3+ssl://``
   IMAP         ``imap://``    Can also specify SSL with ``imap+ssl://``
     protocol://username:password@domain
 
 Basic IMAP Example: ``imap://username:password@server``
+
 Basic POP3 Example: ``pop3://username:password@server``
 
 Most mailboxes these days are SSL-enabled; if yours is, add ``+ssl`` to your URI.  Also, if your username or password include any non-ascii characters,  they should be URL-encoded (for example, if your username includes an ``@``, it should be changed to ``%40`` in your URI).
 
-If you have an account named 'contemporanea@gmail.com' with a password of '1234' on GMail (which I happen to know uses the POP3 server of 'pop.gmail.com' and requires SSL), you would enter the following as your URI::
+If you have an account named ``youremailaddress@gmail.com`` with a password of ``1234`` on GMail (which I happen to know uses the POP3 server of 'pop.gmail.com' and requires SSL), you would enter the following as your URI::
 
-    pop3+ssl://contemporanea%40gmail.com:1234@pop.gmail.com
+    pop3+ssl://youremailaddress%40gmail.com:1234@pop.gmail.com
 
 Local File-based Mailboxes
 --------------------------
 
-If you happen to want to consume a file-based mailbox like an Maildir, Mbox, Babyl, MH, or MMDF mailbox, you can use this too by entering the appropriate 'protocol' in the URI.  If you had a maildir, for example, at @/var/mail/@, you would enter a URI like::
+If you happen to want to consume a file-based mailbox like an Maildir, Mbox, Babyl, MH, or MMDF mailbox, you can use this too by entering the appropriate 'protocol' in the URI.  If you had a maildir, for example, at ``/var/mail/``, you would enter a URI like::
 
     maildir:///var/mail
 
-.. important::
-   Note that there are three slashes in the above URI.
+Note that there is an additional ``/`` in the above URI after the protocol; this is important.
 
 Subscribing to the incoming mail signal
 =======================================
 
 setup(
     name='django-mailbox',
-    version='1.0.1',
+    version='1.0.4',
     url='http://bitbucket.org/latestrevision/django-mailbox/',
-    description='Automatically import mail from POP3 or IMAP into Django',
+    description='Automatically import mail from POP3, IMAP, or a local mailbox into Django',
     author='Adam Coddington',
     author_email='me@adamcoddington.net',
     classifiers=[