conduit r1257 - in trunk: . conduit/modules/GmailModule conduit/modules/GmailModule/libgmail conduit/modules/GmailModule/libgmail-0.1.6.2 scripts



Author: jstowers
Date: Mon Jan 21 10:11:24 2008
New Revision: 1257
URL: http://svn.gnome.org/viewvc/conduit?rev=1257&view=rev

Log:
2008-01-21  John Stowers  <john stowers gmail com>

	* conduit/modules/GmailModule/GmailModule.py:
	* conduit/modules/GmailModule/Makefile.am:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/CHANGELOG:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/COPYING:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/Makefile.am:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/PKG-INFO:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/README:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/lgconstants.py:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/libgmail.py:
	* conduit/modules/GmailModule/libgmail-0.1.6.2/setup.py:
	* conduit/modules/GmailModule/libgmail/CHANGELOG:
	* conduit/modules/GmailModule/libgmail/COPYING:
	* conduit/modules/GmailModule/libgmail/Makefile.am:
	* conduit/modules/GmailModule/libgmail/README:
	* conduit/modules/GmailModule/libgmail/gmail_transport.py:
	* conduit/modules/GmailModule/libgmail/lgconstants.py:
	* conduit/modules/GmailModule/libgmail/libgmail.py:
	* configure.ac:
	* scripts/update-3rdparty-libs.sh: Update libgmail to the CVS version



Added:
   trunk/conduit/modules/GmailModule/libgmail/
   trunk/conduit/modules/GmailModule/libgmail/CHANGELOG
   trunk/conduit/modules/GmailModule/libgmail/COPYING
   trunk/conduit/modules/GmailModule/libgmail/Makefile.am
   trunk/conduit/modules/GmailModule/libgmail/README
   trunk/conduit/modules/GmailModule/libgmail/gmail_transport.py
   trunk/conduit/modules/GmailModule/libgmail/lgconstants.py
   trunk/conduit/modules/GmailModule/libgmail/libgmail.py
Removed:
   trunk/conduit/modules/GmailModule/libgmail-0.1.6.2/
Modified:
   trunk/ChangeLog
   trunk/conduit/modules/GmailModule/GmailModule.py
   trunk/conduit/modules/GmailModule/Makefile.am
   trunk/configure.ac
   trunk/scripts/update-3rdparty-libs.sh

Modified: trunk/conduit/modules/GmailModule/GmailModule.py
==============================================================================
--- trunk/conduit/modules/GmailModule/GmailModule.py	(original)
+++ trunk/conduit/modules/GmailModule/GmailModule.py	Mon Jan 21 10:11:24 2008
@@ -14,7 +14,9 @@
 import conduit.datatypes.Email as Email
 import conduit.datatypes.Contact as Contact
 
-Utils.dataprovider_add_dir_to_path(__file__, "libgmail-0.1.6.2")
+#Distributors, we pretty much ship the most recent libgmail CVS because
+#its not supported by google, so tends to break often
+Utils.dataprovider_add_dir_to_path(__file__, "libgmail")
 import libgmail
 
 MODULES = {

Modified: trunk/conduit/modules/GmailModule/Makefile.am
==============================================================================
--- trunk/conduit/modules/GmailModule/Makefile.am	(original)
+++ trunk/conduit/modules/GmailModule/Makefile.am	Mon Jan 21 10:11:24 2008
@@ -1,4 +1,4 @@
-SUBDIRS = libgmail-0.1.6.2
+SUBDIRS = libgmail
 
 conduit_handlersdir = $(libdir)/conduit/modules/GmailModule
 conduit_handlers_PYTHON = GmailModule.py

Added: trunk/conduit/modules/GmailModule/libgmail/CHANGELOG
==============================================================================
--- (empty file)
+++ trunk/conduit/modules/GmailModule/libgmail/CHANGELOG	Mon Jan 21 10:11:24 2008
@@ -0,0 +1,302 @@
+== Version 0.1.8 ==
+libgmail.py
+    * Added 'search' method to contactLists that returns
+      an array of contacts who match a given search term
+      (at some point, the contacts API is long overdue
+       for a revamp, but for now, hey, why not)
+      This is a patch by Alex Chiang     --WD--
+    * libgmail now asks for the old Gmail interface,
+      so that it isn't broken by the new Gmail updates.
+      (Thanks to Aaron and Stu for work on this)
+      (Fixes SF bug #1822662)
+
+== Version 0.1.7 ==
+libgmail.py
+gmail_transport.py
+    * Applied patch that adds proxy support, both 
+      for passwordless and password-ful proxies 
+      (is that a word?), by Jose Rodriguez --WD+SZ--
+
+== Version 0.1.6.2 ==
+libgmail.py
+    * Bugfix for attachment problems --WD--
+      (SF Bug #1793026, Patch #1799605 by 'stephster')
+archive.py
+    * Protect messages with a "from" line in them --WD--
+      (SF Patch #1790809 by 'scop')
+
+== Version 0.1.6.1 == 
+libgmail.py
+    * Bugfix for login problems --WD--
+
+== Version 0.1.6 == 
+libgmail.py
+    * Added support for "Gmail Apps" aka "Gmail For Your Domain" --WD--
+
+== Version 0.1.5.1 ==
+libgmail.py
+    * Minor bugfix release -- logging in with the wrong
+      username and password caused a crash instead of
+      the appropriate thrown exception --WD--
+
+== Version 0.1.5 ==
+libgmail.py
+    * Fixed exception in the testcode (SF bug #1486703) --SZ--
+    * Fixed broken login caused by slight format change
+      (SF Bug #1534275 - Thanks, anonymous tipster!) --WD--
+    * Added another attribute to the message class: to
+      (SF Bug #1528766) --WD--
+    * Fixed problems caused by repeated commas
+      (SF Bug #1512361) --SZ--
+
+== Version 0.1.4 ==
+libgmail.py
+    * Started new contacts code. --SZ--
+    * Bugfix involving 404 error raised when trying to send
+      an email (SF bug #1398323) --WD--
+    * Bugfix for broken len() iterator in GmailSearchResult
+      (SF bug #1365166) --WD--
+    * Bugfix for improper marking of messages as read
+      (SF bug #1365188) --WD--
+
+    NOTE: Expect an improved Contacts API in the next release.
+          We will strive for backwards-compatibility where
+          possible, but be prepared for possible changes.
+          Please feel free to contact us if you have
+          questions/comments/concerns about this.
+ 
+== Version 0.1.3.3 ==
+libgmail.py
+    * Fixed some bugs in the return values of the label methods. --SZ--
+
+== Version 0.1.3.2 ==
+libgmail.py
+ * Added some attributes to the message class: cc, bcc, sender. --SZ--
+ * Fixed the value returnt by a __len__ call to the threads. --SZ--
+ * Fixed bug in the sendmessage result --SZ--
+ * Added a exception catch to the getUnreadMsgCount method. --SZ--
+ * Added a method to only retrieve the unread messages from the inbox. --SZ--
+ 
+== Version 0.1.3.1 ==
+libgmail.py
+ * Fixed the problem that not all the messages from a thread were
+    returnt. --SZ--
+ * Added a exception catch for a "500 server error" --SZ--
+
+== Version 0.1.3 ==
+ libgmail.py
+ * Fixed bugs that crashes libgmail when accessing an empty account --SZ--
+ * Fixed returning not all the messages in large accounts. --SZ-- 
+
+== Version 0.1.2 ==
+libgmail.py
+ * Added a \r to the line endings in the VCard export function. This is done
+   to comply with rfc2425 section 5.8.1 --SZ--
+ * Fixed a security bug in the page parser. --SZ--
+
+ 
+== Version: 0.1.1 ==
+All
+ * Renamed the shabang to use the 'env' program in all executables. --SZ--
+ * Fixed the redirect bug caused by the changed Gmail login pages. --WD--
+
+== Version: 0.1.0 ==
+libgmail.py
+ * Added contacts support. --WD--
+ * Added contacts test suite. --WD--
+ * Added finer-grained debugging control --WD--
+ * Applied patch that handles login redirect URL properly now
+   Login now works. --WD--
+ * Removed fork message. It was a left over from the initial forking. --SZ--
+
+constants.py
+ * Renamed to lgconstants.py to avoid name conflicts --WD--
+
+== Version: 0.0.8 (23 August 2004) ==
+libgmail.py
+ *  Fixed login to work again after it was broken by a Gmail change.
+    Centralised cookie extraction. Added debug-level logging of cookie
+    extraction & storage.
+
+ *  Add trash/delete message thread functionality to account object.
+
+constants.py, libgmail.py, mkconstants.py
+ *  Add trash/delete single message functionality to account object.
+
+demos/gmailpopd.py
+ *  Initial rough POP3 proxy server demo. Works with Mail.app when I
+    tried it... :-) Sometimes causes items to be downloaded even when
+    they don't *really* need to be. Causes some items to be marked as
+    read even if the client doesn't actually request them.
+
+ *  Refactored message retrieval from account snapshot to allow
+    partial message retrieval (for TOP functionality).
+
+ *  Added POP3 TOP command functionality which is required by Mozilla as it
+    (wrongly) doesn't work with the absolute minimum command set
+    specified by the RFC and requires TOP.
+
+ *  Fixed copy/paste error to change 'ftp_QUIT' to 'pop_QUIT'.
+
+ *  Moved byte-stuffing and message massaging into separate functions.
+
+libgmail.py, demos/archive.py, demos/gmailftpd.py, demos/gmailpopd.py, demos/gmailsmtp.py, demos/sendmsg.py
+ *  Added `GmailLoginFailure` exception to enable tidier handling of
+    login failures (which could be bad username/password or a Gmail
+    change).
+
+ *  Updated demos to catch `GmailLoginFailure` exception.
+
+ *  Removed non-supported "LOGIN" authentication method in SMTP demo
+    that was included in the server capability response in error.
+
+ANNOUNCE
+ *  Minor typo fix.
+
+
+== Version: 0.0.7 (03 August 2004) ==
+
+constants.py, mkconstants.py
+ *  Added attachment related constants. 
+
+libgmail.py, demos/gmailsmtp.py
+ *  Allow file data to be specified directly (rather than via an on-
+    disk file) when specifying attachments (this allows using existing
+    Message instance payloads mostly directly). Modify SMTP Proxy demo
+    to handle sending attachments.
+
+demos/gmailftpd.py
+ *  Initial import of Gmail attachments FTP Proxy! 
+
+libgmail.py
+ *  Corrected version info for previous release. 
+
+ *  Added 'getMessagesByQuery' function. Added initial attachment
+    retrieval handling. Clean up handling of references to parent
+    objects & account objects. Version info update.
+
+ *  Handle sending attachments. Works, but implementation is extremely
+    *cough* sub-optimal...
+
+ *  Don't try to attach files if there are none. 
+
+
+== Version: 0.0.6 (15 July 2004) ==
+
+demos/gmailsmtp.py
+ *  That was too easy, there oughta be a law! Thanks to Python's
+    undocumented SMTP server module we can now send mail with a
+    standard mail client via (E)SMTP. Extended standard SMTP class to
+    handle ESMTP EHLO & AUTH PLAIN commands.
+
+libgmail.py
+ *  Added utility function '_retrieveJavascript' to 'GmailAccount' to
+    help developers who want to look at it. (In theory also so you can
+    regenerate 'constants.py' but the Javascript Gmail now uses isn't
+    actually useful for that anymore...) (Added by request.)
+
+
+== Version: 0.0.5 (11 July 2004) ==
+
+libgmail.py, demos/sendmsg.py
+ *  Added functionality to enable message sending. Modified automatic
+    cookie handling. Added command line example to send a message.
+    Enabled page requests to be either a URL or a Request instance.
+
+constants.py, mkconstants.py
+ *  Added more useful constants.
+
+
+== Version: 0.0.4 (11 July 2004) ==
+
+constants.py, mkconstants.py
+ *  Include standard folder/search name constants. 
+
+ *  Add more useful constants. 
+
+constants.py, libgmail.py, mkconstants.py
+ *  Added category name retrieval. 
+
+mkconstants.py
+ *  'mkconstants' isn't really useful anymore with the new JS version.
+
+libgmail.py
+ *  Add ability to get number of unread messages. 
+
+ *  Handle items that might be 'bunched' such as thread lists better. 
+
+ *  Only warn about mismatched Javascript versions once module import.
+    (Note: This may mean the Javascript version may change more than
+    once in a session and the second change won't be warned, but that
+    shouldn't be much of an issue...)
+
+ *  Refactor URL construction. Refactor query/search operation in
+    preparation for adding searches.
+
+ *  More refactoring. Made thread search query more generic to allow
+    use by (to come) label searches etc. Threads now belong to
+    'GmailSearchResult' instances rather than folders. Threads now
+    retrieve their own messages rather than relying on their parent to
+    do so.
+
+ *  We now refer to categories as labels, as the UI does. Enable
+    retrieval by label.
+
+libgmail.py, demos/archive.py
+ *  Allow all pages of results to be returned for a 'getFolder'
+    request. (Not tested much.)
+
+ *  Provide easy access to standard folder names. Added length
+    property to folders. Examples now handle empty folders gracefully.
+
+ *  Now uses 'getMessagesByXXXXX' style method names for folders &
+    labels. Now refer to original message source as 'source' & not
+    'body'. Enable demos to search by folder name or label name.
+
+
+
+== Version: 0.0.3 (8 July 2004) ==
+
+libgmail.py
+ * Allow username to be specified on the command line instead of prompting.
+ * Rough special case handling of when more than one set of thread information data is present on a page (seemed to occur when using 'all' search after a certain number of items). TODO: Make this fix work at the page parsing level, but splitting all tuples into individual items.
+ * Add cookie handling code to enable us to remove requirement for ClientCookie package. (Especially for Adrian... :-) )
+
+demos/archive.py
+ * *Extremely* rough mbox creation--turns out the mails retrieved had '\r' characters at the end of the headers. The mbox file appears to be successfully imported by OS X's Mail.app client.
+ * Allow username to be specified on the command line instead of prompting.
+
+
+== Version: 0.0.2a (~6 July 2004) ==
+
+* No code change, renamed to try to avoid SourceForge mirroring problems.
+
+
+== Version: 0.0.2 (5 July 2004) ==
+
+constants.py
+ * Useful constants from the Gmail Javascript code as Python module.
+ * Update to match current live Javascript.
+ * Fudge some enumerations that we need to start at 0.
+
+libgmail.py
+ * Refactor to make use of Folder/Thread/Message model. Standardised some naming. Make use of imported Gmail constants. Centralise page retrieval & parsing.
+ * Calculate number of messages in thread.
+ * Refactor & reorganise code. Minor style edits. Refine design of folder, thread & message classes. Modify folders, threads & messages to be as lazy as possible when it comes to retrieving data from the net. Enable message instances to retrieve their original mail text. Add Gmail implementation notes. Hide password entry. Demo now displays threads & messages.
+ * Version date change.
+
+mkconstants.py
+ * Tool to make useful constants from the Gmail Javascript code available via a Python module.
+ * Fudge some enumerations that we need to start at 0.
+
+demos/archive.py
+ * Initial rough demo to archive all messages into text files.
+
+CHANGELOG
+ * Added.
+
+
+== Version: 0.0.1 (2 July 2004) ==
+
+libgmail.py
+ * Initial import of version 0.0.1 (as posted in comp.lang.python).

Added: trunk/conduit/modules/GmailModule/libgmail/COPYING
==============================================================================
--- (empty file)
+++ trunk/conduit/modules/GmailModule/libgmail/COPYING	Mon Jan 21 10:11:24 2008
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

Added: trunk/conduit/modules/GmailModule/libgmail/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/conduit/modules/GmailModule/libgmail/Makefile.am	Mon Jan 21 10:11:24 2008
@@ -0,0 +1,5 @@
+conduit_handlersdir = $(libdir)/conduit/modules/GmailModule/libgmail
+conduit_handlers_PYTHON = lgconstants.py libgmail.py gmail_transport.py
+
+clean-local:
+	rm -rf *.pyc *.pyo

Added: trunk/conduit/modules/GmailModule/libgmail/README
==============================================================================
--- (empty file)
+++ trunk/conduit/modules/GmailModule/libgmail/README	Mon Jan 21 10:11:24 2008
@@ -0,0 +1,47 @@
+libgmail is licensed under the GPL.
+See the file named COPYING for more information.
+
+Please refer to the libgmail website or project page at sourceforge if
+you encounter problems using libgmail.
+http://libgmail.sf.net/
+http://sourceforge.net/projects/libgmail/
+
+You can contact us by email:
+libgmail-developer lists sf net,
+or, individually at
+stas AT linux DOT isbeter DOT nl
+wdaher AT mit DOT edu
+follower AT myrealbox DOT com
+
+-----------------------------------------------
+Possible usage:
+
+Run this:
+
+  python libgmail.py
+
+When you have the demos package installed you could do this:
+
+  python demos/archive.py
+
+or even this:
+
+  python demos/sendmsg.py <account> <to address> <subject> <body>
+
+or perhaps this:
+
+  python demos/gmailsmtp.py # (Then connect to SMTP proxy on local port 8025)
+
+or how about this:
+
+  python demos/gmailftpd.py # (Then connect to FTP proxy on local port 8021,
+                            #  after creating a label named 'ftp' and
+                            #  applying it to some messages with attachments.)
+
+or maybe this:
+
+  python demos/gmailpopd.py # (Then connect to POP3 proxy on local port 8110)
+
+for hours of fun!(*)
+
+(*) Note: Fun may not last for hours. Use at your own risk, blah, blah, etc...
\ No newline at end of file

Added: trunk/conduit/modules/GmailModule/libgmail/gmail_transport.py
==============================================================================
--- (empty file)
+++ trunk/conduit/modules/GmailModule/libgmail/gmail_transport.py	Mon Jan 21 10:11:24 2008
@@ -0,0 +1,144 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# ----------------------------------------------------------------------------------
+# Copyleft (K) by Jose Rodriguez. This source is free (GPL)
+# Partially based on John Nielsen ASPN recipe (http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/301740)
+# Partially based on Alessandro Budai recipe (http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/456195)
+# ----------------------------------------------------------------------------------
+
+
+# urllib2 opener to connection through a proxy using the CONNECT method, (useful for SSL)
+# tested with python 2.4
+
+import urllib2
+import urllib
+import httplib
+import socket
+import base64
+
+
+def split_proxy_URL(proxy):
+	if proxy is None:
+	    return None, None, None
+
+	try:
+	    if proxy[:7] != 'http://':  # Ensures proxy string begins with 'http://'
+	        proxy = 'http://' + proxy
+	except:
+	    pass
+
+	proxy_username = proxy_password = None
+
+	urltype, r_type = urllib.splittype(proxy)
+	proxy, XXX = urllib.splithost(r_type)
+	if '@' in proxy:
+	    proxy_username, proxy = proxy.split('@', 1)
+	    if ':' in proxy_username:
+	        proxy_username, proxy_password = proxy_username.split(':', 1)
+
+	return proxy, proxy_username, proxy_password
+
+
+
+class ProxyHTTPConnection(httplib.HTTPConnection):
+
+	_ports = {'http' : 80, 'https' : 443}
+
+	def request(self, method, url, body=None, headers={}):
+		#request is called before connect, so can interpret url and get
+		#real host/port to be used to make CONNECT request to proxy
+		proto, rest = urllib.splittype(url)
+		if proto is None:
+			raise ValueError, "unknown URL type: %s" % url
+
+		host, rest = urllib.splithost(rest) # get host
+		host, port = urllib.splitport(host) #try to get port
+
+		#if port is not defined try to get from proto
+		if port is None:
+			try:
+				port = self._ports[proto]
+			except KeyError:
+				raise ValueError, "unknown protocol for: %s" % url
+
+		self._real_host = host
+		self._real_port = port
+		httplib.HTTPConnection.request(self, method, url, body, headers)
+		
+
+	def connect(self):
+		httplib.HTTPConnection.connect(self)
+
+		self.send("CONNECT %s:%d HTTP/1.0\r\n" % (self._real_host, self._real_port))
+		if self.proxy_user is not None and self.proxy_passwd is not None:
+			cred = base64.encodestring("%s:%s" % (urllib.unquote(self.proxy_user), urllib.unquote(self.proxy_passwd))).strip()
+			self.send("Proxy-authorization: Basic %s\r\n" % cred)
+
+		self.send("User-Agent: Mozilla/5.0 (Compatible; libgmail-python)\r\n\r\n")
+		response = self.response_class(self.sock, strict=self.strict, method=self._method)
+		(version, code, message) = response._read_status()
+		#probably here we can handle auth requests...
+		if code != 200:
+			#proxy returned and error, abort connection, and raise exception
+			self.close()
+			raise socket.error, "Proxy connection failed: %d %s" % (code, message.strip())
+
+		#eat up header block from proxy....
+		while True:
+			line = response.fp.readline() #should not use directly fp probablu
+			if line == '\r\n': break
+
+
+	@classmethod
+	def new_auth(cls, proxy_host, proxy_user = None, proxy_passwd = None):
+		cls.proxy_host = proxy_host
+		cls.proxy_user = proxy_user
+		cls.proxy_passwd = proxy_passwd
+
+		return cls
+
+
+
+class ProxyHTTPSConnection(ProxyHTTPConnection):
+	
+	default_port = 443
+
+	def __init__(self, host, port = None, key_file = None, cert_file = None, strict = None):
+		ProxyHTTPConnection.__init__(self, host, port)
+		self.key_file = key_file
+		self.cert_file = cert_file
+	
+	def connect(self):
+		ProxyHTTPConnection.connect(self)
+		#make the sock ssl-aware
+		ssl = socket.ssl(self.sock, self.key_file, self.cert_file)
+		self.sock = httplib.FakeSocket(self.sock, ssl)
+
+		
+
+class ConnectHTTPHandler(urllib2.HTTPHandler):
+   
+	def __init__(self, proxy=None, debuglevel=0):
+		self.proxy, self.proxy_user, self.proxy_passwd = split_proxy_URL(proxy)
+		urllib2.HTTPHandler.__init__(self, debuglevel)
+
+	def do_open(self, http_class, req):
+		if self.proxy is not None:
+			req.set_proxy(self.proxy, 'http')
+		return urllib2.HTTPHandler.do_open(self, ProxyHTTPConnection.new_auth(self.proxy, self.proxy_user, self.proxy_passwd), req)
+	
+
+
+class ConnectHTTPSHandler(urllib2.HTTPSHandler):
+
+	def __init__(self, proxy=None, debuglevel=0):
+		self.proxy, self.proxy_user, self.proxy_passwd = split_proxy_URL(proxy)
+		urllib2.HTTPSHandler.__init__(self, debuglevel)
+
+	def do_open(self, http_class, req):
+		if self.proxy is not None:
+			req.set_proxy(self.proxy, 'https')
+		return urllib2.HTTPSHandler.do_open(self, ProxyHTTPSConnection.new_auth(self.proxy, self.proxy_user, self.proxy_passwd), req)
+
+

Added: trunk/conduit/modules/GmailModule/libgmail/lgconstants.py
==============================================================================
--- (empty file)
+++ trunk/conduit/modules/GmailModule/libgmail/lgconstants.py	Mon Jan 21 10:11:24 2008
@@ -0,0 +1,231 @@
+#
+# Generated file -- DO NOT EDIT
+#
+# Note: This file is now edited! 2005-04-25
+#
+# constants.py -- Useful constants extracted from Gmail Javascript code
+#
+# Source version: 44f09303f2d4f76f
+#
+# Generated: 2004-08-10 13:08 UTC
+#
+
+
+URL_LOGIN = "https://www.google.com/accounts/ServiceLoginBoxAuth";
+URL_GMAIL = "https://mail.google.com/mail/";
+
+
+# Constants with names not from the Gmail Javascript:
+U_SAVEDRAFT_VIEW = "sd"
+
+D_DRAFTINFO = "di"
+# NOTE: All other DI_* field offsets seem to match the MI_* field offsets
+DI_BODY = 19
+
+versionWarned = False # If the Javascript version is different have we
+                      # warned about it?
+
+
+js_version = '44f09303f2d4f76f'
+
+D_VERSION = "v"
+D_QUOTA = "qu"
+D_DEFAULTSEARCH_SUMMARY = "ds"
+D_THREADLIST_SUMMARY = "ts"
+D_THREADLIST_END = "te"
+D_THREAD = "t"
+D_CONV_SUMMARY = "cs"
+D_CONV_END = "ce"
+D_MSGINFO = "mi"
+D_MSGBODY = "mb"
+D_MSGATT = "ma"
+D_COMPOSE = "c"
+D_CONTACT = "co"
+D_CATEGORIES = "ct"
+D_CATEGORIES_COUNT_ALL = "cta"
+D_ACTION_RESULT = "ar"
+D_SENDMAIL_RESULT = "sr"
+D_PREFERENCES = "p"
+D_PREFERENCES_PANEL = "pp"
+D_FILTERS = "fi"
+D_GAIA_NAME = "gn"
+D_INVITE_STATUS = "i"
+D_END_PAGE = "e"
+D_LOADING = "l"
+D_LOADED_SUCCESS = "ld"
+D_LOADED_ERROR = "le"
+D_QUICKLOADED = "ql"
+QU_SPACEUSED = 0
+QU_QUOTA = 1
+QU_PERCENT = 2
+QU_COLOR = 3
+TS_START = 0
+TS_NUM = 1
+TS_TOTAL = 2
+TS_ESTIMATES = 3
+TS_TITLE = 4
+TS_TIMESTAMP = 5 + 1
+TS_TOTAL_MSGS = 6 + 1
+T_THREADID = 0
+T_UNREAD = 1
+T_STAR = 2
+T_DATE_HTML = 3
+T_AUTHORS_HTML = 4
+T_FLAGS = 5
+T_SUBJECT_HTML = 6
+T_SNIPPET_HTML = 7
+T_CATEGORIES = 8
+T_ATTACH_HTML = 9
+T_MATCHING_MSGID = 10
+T_EXTRA_SNIPPET = 11
+CS_THREADID = 0
+CS_SUBJECT = 1
+CS_TITLE_HTML = 2
+CS_SUMMARY_HTML = 3
+CS_CATEGORIES = 4
+CS_PREVNEXTTHREADIDS = 5
+CS_THREAD_UPDATED = 6
+CS_NUM_MSGS = 7
+CS_ADKEY = 8
+CS_MATCHING_MSGID = 9
+MI_FLAGS = 0
+MI_NUM = 1
+MI_MSGID = 2
+MI_STAR = 3
+MI_REFMSG = 4
+MI_AUTHORNAME = 5
+MI_AUTHORFIRSTNAME = 6 # ? -- Name supplied by rj
+MI_AUTHOREMAIL = 6 + 1
+MI_MINIHDRHTML = 7 + 1
+MI_DATEHTML = 8 + 1
+MI_TO = 9 + 1
+MI_CC = 10 + 1
+MI_BCC = 11 + 1
+MI_REPLYTO = 12 + 1
+MI_DATE = 13 + 1
+MI_SUBJECT = 14 + 1
+MI_SNIPPETHTML = 15 + 1
+MI_ATTACHINFO = 16 + 1
+MI_KNOWNAUTHOR = 17 + 1
+MI_PHISHWARNING = 18 + 1
+A_ID = 0
+A_FILENAME = 1
+A_MIMETYPE = 2
+A_FILESIZE = 3
+CT_NAME = 0
+CT_COUNT = 1
+AR_SUCCESS = 0
+AR_MSG = 1
+SM_COMPOSEID = 0
+SM_SUCCESS = 1
+SM_MSG = 2
+SM_NEWTHREADID = 3
+CMD_SEARCH = "SEARCH"
+ACTION_TOKEN_COOKIE = "GMAIL_AT"
+U_VIEW = "view"
+U_PAGE_VIEW = "page"
+U_THREADLIST_VIEW = "tl"
+U_CONVERSATION_VIEW = "cv"
+U_COMPOSE_VIEW = "cm"
+U_PRINT_VIEW = "pt"
+U_PREFERENCES_VIEW = "pr"
+U_JSREPORT_VIEW = "jr"
+U_UPDATE_VIEW = "up"
+U_SENDMAIL_VIEW = "sm"
+U_AD_VIEW = "ad"
+U_REPORT_BAD_RELATED_INFO_VIEW = "rbri"
+U_ADDRESS_VIEW = "address"
+U_ADDRESS_IMPORT_VIEW = "ai"
+U_SPELLCHECK_VIEW = "sc"
+U_INVITE_VIEW = "invite"
+U_ORIGINAL_MESSAGE_VIEW = "om"
+U_ATTACHMENT_VIEW = "att"
+U_DEBUG_ADS_RESPONSE_VIEW = "da"
+U_SEARCH = "search"
+U_INBOX_SEARCH = "inbox"
+U_STARRED_SEARCH = "starred"
+U_ALL_SEARCH = "all"
+U_DRAFTS_SEARCH = "drafts"
+U_SENT_SEARCH = "sent"
+U_SPAM_SEARCH = "spam"
+U_TRASH_SEARCH = "trash"
+U_QUERY_SEARCH = "query"
+U_ADVANCED_SEARCH = "adv"
+U_CREATEFILTER_SEARCH = "cf"
+U_CATEGORY_SEARCH = "cat"
+U_AS_FROM = "as_from"
+U_AS_TO = "as_to"
+U_AS_SUBJECT = "as_subj"
+U_AS_SUBSET = "as_subset"
+U_AS_HAS = "as_has"
+U_AS_HASNOT = "as_hasnot"
+U_AS_ATTACH = "as_attach"
+U_AS_WITHIN = "as_within"
+U_AS_DATE = "as_date"
+U_AS_SUBSET_ALL = "all"
+U_AS_SUBSET_INBOX = "inbox"
+U_AS_SUBSET_STARRED = "starred"
+U_AS_SUBSET_SENT = "sent"
+U_AS_SUBSET_DRAFTS = "drafts"
+U_AS_SUBSET_SPAM = "spam"
+U_AS_SUBSET_TRASH = "trash"
+U_AS_SUBSET_ALLSPAMTRASH = "ast"
+U_AS_SUBSET_READ = "read"
+U_AS_SUBSET_UNREAD = "unread"
+U_AS_SUBSET_CATEGORY_PREFIX = "cat_"
+U_THREAD = "th"
+U_PREV_THREAD = "prev"
+U_NEXT_THREAD = "next"
+U_DRAFT_MSG = "draft"
+U_START = "start"
+U_ACTION = "act"
+U_ACTION_TOKEN = "at"
+U_INBOX_ACTION = "ib"
+U_MARKREAD_ACTION = "rd"
+U_MARKUNREAD_ACTION = "ur"
+U_MARKSPAM_ACTION = "sp"
+U_UNMARKSPAM_ACTION = "us"
+U_MARKTRASH_ACTION = "tr"
+U_ADDCATEGORY_ACTION = "ac_"
+U_REMOVECATEGORY_ACTION = "rc_"
+U_ADDSTAR_ACTION = "st"
+U_REMOVESTAR_ACTION = "xst"
+U_ADDSENDERTOCONTACTS_ACTION = "astc"
+U_DELETEMESSAGE_ACTION = "dm"
+U_DELETE_ACTION = "dl"
+U_EMPTYSPAM_ACTION = "es_"
+U_EMPTYTRASH_ACTION = "et_"
+U_SAVEPREFS_ACTION = "prefs"
+U_ADDRESS_ACTION = "a"
+U_CREATECATEGORY_ACTION = "cc_"
+U_DELETECATEGORY_ACTION = "dc_"
+U_RENAMECATEGORY_ACTION = "nc_"
+U_CREATEFILTER_ACTION = "cf"
+U_REPLACEFILTER_ACTION = "rf"
+U_DELETEFILTER_ACTION = "df_"
+U_ACTION_THREAD = "t"
+U_ACTION_MESSAGE = "m"
+U_ACTION_PREF_PREFIX = "p_"
+U_REFERENCED_MSG = "rm"
+U_COMPOSEID = "cmid"
+U_COMPOSE_MODE = "cmode"
+U_COMPOSE_SUBJECT = "su"
+U_COMPOSE_TO = "to"
+U_COMPOSE_CC = "cc"
+U_COMPOSE_BCC = "bcc"
+U_COMPOSE_BODY = "body"
+U_PRINT_THREAD = "pth"
+CONV_VIEW = "conv"
+TLIST_VIEW = "tlist"
+PREFS_VIEW = "prefs"
+HIST_VIEW = "hist"
+COMPOSE_VIEW = "comp"
+HIDDEN_ACTION = 0
+USER_ACTION = 1
+BACKSPACE_ACTION = 2
+
+# TODO: Get these on the fly?
+STANDARD_FOLDERS = [U_INBOX_SEARCH, U_STARRED_SEARCH,
+                    U_ALL_SEARCH, U_DRAFTS_SEARCH,
+                    U_SENT_SEARCH, U_SPAM_SEARCH]
+

Added: trunk/conduit/modules/GmailModule/libgmail/libgmail.py
==============================================================================
--- (empty file)
+++ trunk/conduit/modules/GmailModule/libgmail/libgmail.py	Mon Jan 21 10:11:24 2008
@@ -0,0 +1,1660 @@
+#!/usr/bin/env python
+#
+# libgmail -- Gmail access via Python
+#
+## To get the version number of the available libgmail version.
+## Reminder: add date before next release. This attribute is also
+## used in the setup script.
+Version = '0.1.8' # (Nov 2007)
+
+# Original author: follower rancidbacon com
+# Maintainers: Waseem (wdaher mit edu) and Stas Z (stas linux isbeter nl)
+#
+# License: GPL 2.0
+#
+# NOTE:
+#   You should ensure you are permitted to use this script before using it
+#   to access Google's Gmail servers.
+#
+#
+# Gmail Implementation Notes
+# ==========================
+#
+# * Folders contain message threads, not individual messages. At present I
+#   do not know any way to list all messages without processing thread list.
+#
+
+LG_DEBUG=0
+from lgconstants import *
+
+import os,pprint
+import re
+import urllib
+import urllib2
+import mimetypes
+import types
+from cPickle import load, dump
+
+from email.MIMEBase import MIMEBase
+from email.MIMEText import MIMEText
+from email.MIMEMultipart import MIMEMultipart
+
+GMAIL_URL_LOGIN = "https://www.google.com/accounts/ServiceLoginBoxAuth";
+GMAIL_URL_GMAIL = "https://mail.google.com/mail/?ui=1&";
+
+#  Set to any value to use proxy.
+PROXY_URL = None  # e.g. libgmail.PROXY_URL = 'myproxy.org:3128'
+
+# TODO: Get these on the fly?
+STANDARD_FOLDERS = [U_INBOX_SEARCH, U_STARRED_SEARCH,
+                    U_ALL_SEARCH, U_DRAFTS_SEARCH,
+                    U_SENT_SEARCH, U_SPAM_SEARCH]
+
+# Constants with names not from the Gmail Javascript:
+# TODO: Move to `lgconstants.py`?
+U_SAVEDRAFT_VIEW = "sd"
+
+D_DRAFTINFO = "di"
+# NOTE: All other DI_* field offsets seem to match the MI_* field offsets
+DI_BODY = 19
+
+versionWarned = False # If the Javascript version is different have we
+                      # warned about it?
+
+
+RE_SPLIT_PAGE_CONTENT = re.compile("D\((.*?)\);", re.DOTALL)
+
+class GmailError(Exception):
+    '''
+    Exception thrown upon gmail-specific failures, in particular a
+    failure to log in and a failure to parse responses.
+
+    '''
+    pass
+
+class GmailSendError(Exception):
+    '''
+    Exception to throw if we're unable to send a message
+    '''
+    pass
+
+def _parsePage(pageContent):
+    """
+    Parse the supplied HTML page and extract useful information from
+    the embedded Javascript.
+    
+    """
+    lines = pageContent.splitlines()
+    data = '\n'.join([x for x in lines if x and x[0] in ['D', ')', ',', ']']])
+    #data = data.replace(',,',',').replace(',,',',')
+    data = re.sub(',{2,}', ',', data)
+    
+    result = []
+    try:
+        exec data in {'__builtins__': None}, {'D': lambda x: result.append(x)}
+    except SyntaxError,info:
+        print info
+        raise GmailError, 'Failed to parse data returned from gmail.'
+
+    items = result 
+    itemsDict = {}
+    namesFoundTwice = []
+    for item in items:
+        name = item[0]
+        try:
+            parsedValue = item[1:]
+        except Exception:
+            parsedValue = ['']
+        if itemsDict.has_key(name):
+            # This handles the case where a name key is used more than
+            # once (e.g. mail items, mail body etc) and automatically
+            # places the values into list.
+            # TODO: Check this actually works properly, it's early... :-)
+            
+            if len(parsedValue) and type(parsedValue[0]) is types.ListType:
+                    for item in parsedValue:
+                        itemsDict[name].append(item)
+            else:
+                itemsDict[name].append(parsedValue)
+        else:
+            if len(parsedValue) and type(parsedValue[0]) is types.ListType:
+                    itemsDict[name] = []
+                    for item in parsedValue:
+                        itemsDict[name].append(item)
+            else:
+                itemsDict[name] = [parsedValue]
+
+    return itemsDict
+
+def _splitBunches(infoItems):# Is this still needed ?? Stas
+    """
+    Utility to help make it easy to iterate over each item separately,
+    even if they were bunched on the page.
+    """
+    result= []
+    # TODO: Decide if this is the best approach.
+    for group in infoItems:
+        if type(group) == tuple:
+            result.extend(group)
+        else:
+            result.append(group)
+    return result
+
+class SmartRedirectHandler(urllib2.HTTPRedirectHandler):
+    def __init__(self, cookiejar):
+        self.cookiejar = cookiejar
+
+    def http_error_302(self, req, fp, code, msg, headers):
+        # The location redirect doesn't seem to change
+        # the hostname header appropriately, so we do
+        # by hand. (Is this a bug in urllib2?)
+        new_host = re.match(r'http[s]*://(.*?\.google\.com)',
+                            headers.getheader('Location'))
+        if new_host:
+            req.add_header("Host", new_host.groups()[0])
+        result = urllib2.HTTPRedirectHandler.http_error_302(
+            self, req, fp, code, msg, headers)              
+        return result
+
+class CookieJar:
+    """
+    A rough cookie handler, intended to only refer to one domain.
+
+    Does no expiry or anything like that.
+
+    (The only reason this is here is so I don't have to require
+    the `ClientCookie` package.)
+    
+    """
+
+    def __init__(self):
+        """
+        """
+        self._cookies = {}
+
+
+    def extractCookies(self, headers, nameFilter = None):
+        """
+        """
+        # TODO: Do this all more nicely?
+        for cookie in headers.getheaders('Set-Cookie'):
+            name, value = (cookie.split("=", 1) + [""])[:2]
+            if LG_DEBUG: print "Extracted cookie `%s`" % (name)
+            if not nameFilter or name in nameFilter:
+                self._cookies[name] = value.split(";")[0]
+                if LG_DEBUG: print "Stored cookie `%s` value `%s`" % (name, self._cookies[name])
+                if self._cookies[name] == "EXPIRED":
+                    if LG_DEBUG:
+                        print "We got an expired cookie: %s:%s, deleting." % (name, self._cookies[name])
+                    del self._cookies[name]
+
+
+    def addCookie(self, name, value):
+        """
+        """
+        self._cookies[name] = value
+
+
+    def setCookies(self, request):
+        """
+        """
+        request.add_header('Cookie',
+                           ";".join(["%s=%s" % (k,v)
+                                     for k,v in self._cookies.items()]))
+
+        
+    
+def _buildURL(**kwargs):
+    """
+    """
+    return "%s%s" % (URL_GMAIL, urllib.urlencode(kwargs))
+
+
+
+def _paramsToMime(params, filenames, files):
+    """
+    """
+    mimeMsg = MIMEMultipart("form-data")
+
+    for name, value in params.iteritems():
+        mimeItem = MIMEText(value)
+        mimeItem.add_header("Content-Disposition", "form-data", name=name)
+
+        # TODO: Handle this better...?
+        for hdr in ['Content-Type','MIME-Version','Content-Transfer-Encoding']:
+            del mimeItem[hdr]
+
+        mimeMsg.attach(mimeItem)
+
+    if filenames or files:
+        filenames = filenames or []
+        files = files or []
+        for idx, item in enumerate(filenames + files):
+            # TODO: This is messy, tidy it...
+            if isinstance(item, str):
+                # We assume it's a file path...
+                filename = item
+                contentType = mimetypes.guess_type(filename)[0]
+                payload = open(filename, "rb").read()
+            else:
+                # We assume it's an `email.Message.Message` instance...
+                # TODO: Make more use of the pre-encoded information?
+                filename = item.get_filename()
+                contentType = item.get_content_type()
+                payload = item.get_payload(decode=True)
+                
+            if not contentType:
+                contentType = "application/octet-stream"
+                
+            mimeItem = MIMEBase(*contentType.split("/"))
+            mimeItem.add_header("Content-Disposition", "form-data",
+                                name="file%s" % idx, filename=filename)
+            # TODO: Encode the payload?
+            mimeItem.set_payload(payload)
+
+            # TODO: Handle this better...?
+            for hdr in ['MIME-Version','Content-Transfer-Encoding']:
+                del mimeItem[hdr]
+
+            mimeMsg.attach(mimeItem)
+
+    del mimeMsg['MIME-Version']
+
+    return mimeMsg
+
+
+class GmailLoginFailure(Exception):
+    """
+    Raised whenever the login process fails--could be wrong username/password,
+    or Gmail service error, for example.
+    Extract the error message like this:
+    try:
+        foobar 
+    except GmailLoginFailure,e:
+        mesg = e.message# or
+        print e# uses the __str__
+    """
+    def __init__(self,message):
+        self.message = message
+    def __str__(self):
+        return repr(self.message)
+
+class GmailAccount:
+    """
+    """
+
+    def __init__(self, name = "", pw = "", state = None, domain = None):
+        global URL_LOGIN, URL_GMAIL
+        """
+        """
+        self.domain = domain
+        if self.domain:
+            URL_LOGIN = "https://www.google.com/a/"; + self.domain + "/LoginAction"
+            URL_GMAIL = "http://mail.google.com/a/"; + self.domain + "/?"
+        else:
+            URL_LOGIN = GMAIL_URL_LOGIN
+            URL_GMAIL = GMAIL_URL_GMAIL
+        if name and pw:
+            self.name = name
+            self._pw = pw
+            self._cookieJar = CookieJar()
+
+            if PROXY_URL is not None:
+                import gmail_transport
+
+                self.opener = urllib2.build_opener(gmail_transport.ConnectHTTPHandler(proxy = PROXY_URL),
+                                  gmail_transport.ConnectHTTPSHandler(proxy = PROXY_URL),
+                                  SmartRedirectHandler(self._cookieJar))
+            else:
+                self.opener = urllib2.build_opener(
+                                urllib2.HTTPHandler(debuglevel=0),
+                                urllib2.HTTPSHandler(debuglevel=0),
+                                SmartRedirectHandler(self._cookieJar))
+        elif state:
+            # TODO: Check for stale state cookies?
+            self.name, self._cookieJar = state.state
+        else:
+            raise ValueError("GmailAccount must be instantiated with " \
+                             "either GmailSessionState object or name " \
+                             "and password.")
+
+        self._cachedQuotaInfo = None
+        self._cachedLabelNames = None
+        
+
+    def login(self):
+        """
+        """
+        # TODO: Throw exception if we were instantiated with state?
+        if self.domain:
+            data = urllib.urlencode({'continue': URL_GMAIL,
+                                     'at'      : 'null',
+                                     'service' : 'mail',
+                                     'userName': self.name,
+                                     'password': self._pw,
+                                     })
+        else:
+            data = urllib.urlencode({'continue': URL_GMAIL,
+                                     'Email': self.name,
+                                     'Passwd': self._pw,
+                                     })
+                                           
+        headers = {'Host': 'www.google.com',
+                   'User-Agent': 'Mozilla/5.0 (Compatible; libgmail-python)'}
+
+        req = urllib2.Request(URL_LOGIN, data=data, headers=headers)
+        pageData = self._retrievePage(req)
+        
+        if not self.domain:
+        # The GV cookie no longer comes in this page for
+        # "Apps", so this bottom portion is unnecessary for it.
+            # This requests the page that provides the required "GV" cookie.
+            RE_PAGE_REDIRECT = 'CheckCookie\?continue=([^"\']+)' 
+        
+            # TODO: Catch more failure exceptions here...?
+            try:
+                link = re.search(RE_PAGE_REDIRECT, pageData).group(1)
+                redirectURL = urllib2.unquote(link)
+                redirectURL = redirectURL.replace('\\x26', '&')
+            
+            except AttributeError:
+                raise GmailLoginFailure("Login failed. (Wrong username/password?)")
+            # We aren't concerned with the actual content of this page,
+            # just the cookie that is returned with it.
+            pageData = self._retrievePage(redirectURL)
+
+    def _retrievePage(self, urlOrRequest):
+        """
+        """
+        if self.opener is None:
+            raise "Cannot find urlopener"
+        
+        if not isinstance(urlOrRequest, urllib2.Request):
+            req = urllib2.Request(urlOrRequest)
+        else:
+            req = urlOrRequest
+            
+        self._cookieJar.setCookies(req)
+        req.add_header('User-Agent',
+                       'Mozilla/5.0 (Compatible; libgmail-python)')
+        
+        try:
+            resp = self.opener.open(req)
+        except urllib2.HTTPError,info:
+            print info
+            return None
+        pageData = resp.read()
+
+        # Extract cookies here
+        self._cookieJar.extractCookies(resp.headers)
+
+        # TODO: Enable logging of page data for debugging purposes?
+
+        return pageData
+
+
+    def _parsePage(self, urlOrRequest):
+        """
+        Retrieve & then parse the requested page content.
+        
+        """
+        items = _parsePage(self._retrievePage(urlOrRequest))
+        # Automatically cache some things like quota usage.
+        # TODO: Cache more?
+        # TODO: Expire cached values?
+        # TODO: Do this better.
+        try:
+            self._cachedQuotaInfo = items[D_QUOTA]
+        except KeyError:
+            pass
+        #pprint.pprint(items)
+        
+        try:
+            self._cachedLabelNames = [category[CT_NAME] for category in items[D_CATEGORIES][0]]
+        except KeyError:
+            pass
+        
+        return items
+
+
+    def _parseSearchResult(self, searchType, start = 0, **kwargs):
+        """
+        """
+        params = {U_SEARCH: searchType,
+                  U_START: start,
+                  U_VIEW: U_THREADLIST_VIEW,
+                  }
+        params.update(kwargs)
+        return self._parsePage(_buildURL(**params))
+
+
+    def _parseThreadSearch(self, searchType, allPages = False, **kwargs):
+        """
+
+        Only works for thread-based results at present. # TODO: Change this?
+        """
+        start = 0
+        tot = 0
+        threadsInfo = []
+        # Option to get *all* threads if multiple pages are used.
+        while (start == 0) or (allPages and
+                               len(threadsInfo) < threadListSummary[TS_TOTAL]):
+            
+                items = self._parseSearchResult(searchType, start, **kwargs)
+                #TODO: Handle single & zero result case better? Does this work?
+                try:
+                    threads = items[D_THREAD]
+                except KeyError:
+                    break
+                else:
+                    for th in threads:
+                        if not type(th[0]) is types.ListType:
+                            th = [th]
+                        threadsInfo.append(th)
+                    # TODO: Check if the total or per-page values have changed?
+                    threadListSummary = items[D_THREADLIST_SUMMARY][0]
+                    threadsPerPage = threadListSummary[TS_NUM]
+    
+                    start += threadsPerPage
+        
+        # TODO: Record whether or not we retrieved all pages..?
+        return GmailSearchResult(self, (searchType, kwargs), threadsInfo)
+
+
+    def _retrieveJavascript(self, version = ""):
+        """
+
+        Note: `version` seems to be ignored.
+        """
+        return self._retrievePage(_buildURL(view = U_PAGE_VIEW,
+                                            name = "js",
+                                            ver = version))
+        
+        
+    def getMessagesByFolder(self, folderName, allPages = False):
+        """
+
+        Folders contain conversation/message threads.
+
+          `folderName` -- As set in Gmail interface.
+
+        Returns a `GmailSearchResult` instance.
+
+        *** TODO: Change all "getMessagesByX" to "getThreadsByX"? ***
+        """
+        return self._parseThreadSearch(folderName, allPages = allPages)
+
+
+    def getMessagesByQuery(self, query,  allPages = False):
+        """
+
+        Returns a `GmailSearchResult` instance.
+        """
+        return self._parseThreadSearch(U_QUERY_SEARCH, q = query,
+                                       allPages = allPages)
+
+    
+    def getQuotaInfo(self, refresh = False):
+        """
+
+        Return MB used, Total MB and percentage used.
+        """
+        # TODO: Change this to a property.
+        if not self._cachedQuotaInfo or refresh:
+            # TODO: Handle this better...
+            self.getMessagesByFolder(U_INBOX_SEARCH)
+
+        return self._cachedQuotaInfo[0][:3]
+
+
+    def getLabelNames(self, refresh = False):
+        """
+        """
+        # TODO: Change this to a property?
+        if not self._cachedLabelNames or refresh:
+            # TODO: Handle this better...
+            self.getMessagesByFolder(U_INBOX_SEARCH)
+
+        return self._cachedLabelNames
+
+
+    def getMessagesByLabel(self, label, allPages = False):
+        """
+        """
+        return self._parseThreadSearch(U_CATEGORY_SEARCH,
+                                       cat=label, allPages = allPages)
+    
+    def getRawMessage(self, msgId):
+        """
+        """
+        # U_ORIGINAL_MESSAGE_VIEW seems the only one that returns a page.
+        # All the other U_* results in a 404 exception. Stas
+        PageView = U_ORIGINAL_MESSAGE_VIEW  
+        return self._retrievePage(
+            _buildURL(view=PageView, th=msgId))
+
+    def getUnreadMessages(self):
+        """
+        """
+        return self._parseThreadSearch(U_QUERY_SEARCH,
+                                        q = "is:" + U_AS_SUBSET_UNREAD)
+        
+        
+    def getUnreadMsgCount(self):
+        """
+        """
+        items = self._parseSearchResult(U_QUERY_SEARCH,
+                                        q = "is:" + U_AS_SUBSET_UNREAD)
+        try:
+            result = items[D_THREADLIST_SUMMARY][0][TS_TOTAL_MSGS]
+        except KeyError:
+            result = 0
+        return result
+
+
+    def _getActionToken(self):
+        """
+        """
+        try:
+            at = self._cookieJar._cookies[ACTION_TOKEN_COOKIE]
+        except KeyError:
+            self.getLabelNames(True) 
+            at = self._cookieJar._cookies[ACTION_TOKEN_COOKIE]           
+
+        return at
+
+
+    def sendMessage(self, msg, asDraft = False, _extraParams = None):
+        """
+
+          `msg` -- `GmailComposedMessage` instance.
+
+          `_extraParams` -- Dictionary containing additional parameters
+                            to put into POST message. (Not officially
+                            for external use, more to make feature
+                            additional a little easier to play with.)
+        
+        Note: Now returns `GmailMessageStub` instance with populated
+              `id` (and `_account`) fields on success or None on failure.
+
+        """
+        # TODO: Handle drafts separately?
+        params = {U_VIEW: [U_SENDMAIL_VIEW, U_SAVEDRAFT_VIEW][asDraft],
+                  U_REFERENCED_MSG: "",
+                  U_THREAD: "",
+                  U_DRAFT_MSG: "",
+                  U_COMPOSEID: "1",
+                  U_ACTION_TOKEN: self._getActionToken(),
+                  U_COMPOSE_TO: msg.to,
+                  U_COMPOSE_CC: msg.cc,
+                  U_COMPOSE_BCC: msg.bcc,
+                  "subject": msg.subject,
+                  "msgbody": msg.body,
+                  }
+
+        if _extraParams:
+            params.update(_extraParams)
+
+        # Amongst other things, I used the following post to work out this:
+        # <http://groups.google.com/groups?
+        #  selm=mailman.1047080233.20095.python-list%40python.org>
+        mimeMessage = _paramsToMime(params, msg.filenames, msg.files)
+
+        #### TODO: Ughh, tidy all this up & do it better...
+        ## This horrible mess is here for two main reasons:
+        ##  1. The `Content-Type` header (which also contains the boundary
+        ##     marker) needs to be extracted from the MIME message so
+        ##     we can send it as the request `Content-Type` header instead.
+        ##  2. It seems the form submission needs to use "\r\n" for new
+        ##     lines instead of the "\n" returned by `as_string()`.
+        ##     I tried changing the value of `NL` used by the `Generator` class
+        ##     but it didn't work so I'm doing it this way until I figure
+        ##     out how to do it properly. Of course, first try, if the payloads
+        ##     contained "\n" sequences they got replaced too, which corrupted
+        ##     the attachments. I could probably encode the submission,
+        ##     which would probably be nicer, but in the meantime I'm kludging
+        ##     this workaround that replaces all non-text payloads with a
+        ##     marker, changes all "\n" to "\r\n" and finally replaces the
+        ##     markers with the original payloads.
+        ## Yeah, I know, it's horrible, but hey it works doesn't it? If you've
+        ## got a problem with it, fix it yourself & give me the patch!
+        ##
+        origPayloads = {}
+        FMT_MARKER = "&&&&&&%s&&&&&&"
+
+        for i, m in enumerate(mimeMessage.get_payload()):
+            if not isinstance(m, MIMEText): #Do we care if we change text ones?
+                origPayloads[i] = m.get_payload()
+                m.set_payload(FMT_MARKER % i)
+
+        mimeMessage.epilogue = ""
+        msgStr = mimeMessage.as_string()
+        contentTypeHeader, data = msgStr.split("\n\n", 1)
+        contentTypeHeader = contentTypeHeader.split(":", 1)
+        data = data.replace("\n", "\r\n")
+        for k,v in origPayloads.iteritems():
+            data = data.replace(FMT_MARKER % k, v)
+        ####
+        
+        req = urllib2.Request(_buildURL(), data = data)
+        req.add_header(*contentTypeHeader)
+        items = self._parsePage(req)
+
+        # TODO: Check composeid?
+        # Sometimes we get the success message
+        # but the id is 0 and no message is sent
+        result = None
+        resultInfo = items[D_SENDMAIL_RESULT][0]
+        
+        if resultInfo[SM_SUCCESS]:
+            result = GmailMessageStub(id = resultInfo[SM_NEWTHREADID],
+                                      _account = self)
+        else:
+            raise GmailSendError, resultInfo[SM_MSG]
+        return result
+
+
+    def trashMessage(self, msg):
+        """
+        """
+        # TODO: Decide if we should make this a method of `GmailMessage`.
+        # TODO: Should we check we have been given a `GmailMessage` instance?
+        params = {
+            U_ACTION: U_DELETEMESSAGE_ACTION,
+            U_ACTION_MESSAGE: msg.id,
+            U_ACTION_TOKEN: self._getActionToken(),
+            }
+
+        items = self._parsePage(_buildURL(**params))
+
+        # TODO: Mark as trashed on success?
+        return (items[D_ACTION_RESULT][0][AR_SUCCESS] == 1)
+
+
+    def _doThreadAction(self, actionId, thread):
+        """
+        """
+        # TODO: Decide if we should make this a method of `GmailThread`.
+        # TODO: Should we check we have been given a `GmailThread` instance?
+        params = {
+            U_SEARCH: U_ALL_SEARCH, #TODO:Check this search value always works.
+            U_VIEW: U_UPDATE_VIEW,
+            U_ACTION: actionId,
+            U_ACTION_THREAD: thread.id,
+            U_ACTION_TOKEN: self._getActionToken(),
+            }
+
+        items = self._parsePage(_buildURL(**params))
+
+        return (items[D_ACTION_RESULT][0][AR_SUCCESS] == 1)
+        
+        
+    def trashThread(self, thread):
+        """
+        """
+        # TODO: Decide if we should make this a method of `GmailThread`.
+        # TODO: Should we check we have been given a `GmailThread` instance?
+
+        result = self._doThreadAction(U_MARKTRASH_ACTION, thread)
+        
+        # TODO: Mark as trashed on success?
+        return result
+
+
+    def _createUpdateRequest(self, actionId): #extraData):
+        """
+        Helper method to create a Request instance for an update (view)
+        action.
+
+        Returns populated `Request` instance.
+        """
+        params = {
+            U_VIEW: U_UPDATE_VIEW,
+            }
+
+        data = {
+            U_ACTION: actionId,
+            U_ACTION_TOKEN: self._getActionToken(),
+            }
+
+        #data.update(extraData)
+
+        req = urllib2.Request(_buildURL(**params),
+                              data = urllib.urlencode(data))
+
+        return req
+
+
+    # TODO: Extract additional common code from handling of labels?
+    def createLabel(self, labelName):
+        """
+        """
+        req = self._createUpdateRequest(U_CREATECATEGORY_ACTION + labelName)
+
+        # Note: Label name cache is updated by this call as well. (Handy!)
+        items = self._parsePage(req)
+        print items
+        return (items[D_ACTION_RESULT][0][AR_SUCCESS] == 1)
+
+
+    def deleteLabel(self, labelName):
+        """
+        """
+        # TODO: Check labelName exits?
+        req = self._createUpdateRequest(U_DELETECATEGORY_ACTION + labelName)
+
+        # Note: Label name cache is updated by this call as well. (Handy!)
+        items = self._parsePage(req)
+
+        return (items[D_ACTION_RESULT][0][AR_SUCCESS] == 1)
+
+
+    def renameLabel(self, oldLabelName, newLabelName):
+        """
+        """
+        # TODO: Check oldLabelName exits?
+        req = self._createUpdateRequest("%s%s^%s" % (U_RENAMECATEGORY_ACTION,
+                                                   oldLabelName, newLabelName))
+
+        # Note: Label name cache is updated by this call as well. (Handy!)
+        items = self._parsePage(req)
+
+        return (items[D_ACTION_RESULT][0][AR_SUCCESS] == 1)
+
+    def storeFile(self, filename, label = None):
+        """
+        """
+        # TODO: Handle files larger than single attachment size.
+        # TODO: Allow file data objects to be supplied?
+        FILE_STORE_VERSION = "FSV_01"
+        FILE_STORE_SUBJECT_TEMPLATE = "%s %s" % (FILE_STORE_VERSION, "%s")
+
+        subject = FILE_STORE_SUBJECT_TEMPLATE % os.path.basename(filename)
+
+        msg = GmailComposedMessage(to="", subject=subject, body="",
+                                   filenames=[filename])
+
+        draftMsg = self.sendMessage(msg, asDraft = True)
+
+        if draftMsg and label:
+            draftMsg.addLabel(label)
+
+        return draftMsg
+
+    ## CONTACTS SUPPORT
+    def getContacts(self):
+        """
+        Returns a GmailContactList object
+        that has all the contacts in it as
+        GmailContacts
+        """
+        contactList = []
+        # pnl = a is necessary to get *all* contacts
+        myUrl = _buildURL(view='cl',search='contacts', pnl='a')
+        myData = self._parsePage(myUrl)
+        # This comes back with a dictionary
+        # with entry 'cl'
+        addresses = myData['cl']
+        for entry in addresses:
+            if len(entry) >= 6 and entry[0]=='ce':
+                newGmailContact = GmailContact(entry[1], entry[2], entry[4], entry[5])
+                #### new code used to get all the notes 
+                #### not used yet due to lockdown problems
+                ##rawnotes = self._getSpecInfo(entry[1])
+                ##print rawnotes
+                ##newGmailContact = GmailContact(entry[1], entry[2], entry[4],rawnotes)
+                contactList.append(newGmailContact)
+
+        return GmailContactList(contactList)
+
+    def addContact(self, myContact, *extra_args):
+        """
+        Attempts to add a GmailContact to the gmail
+        address book. Returns true if successful,
+        false otherwise
+
+        Please note that after version 0.1.3.3,
+        addContact takes one argument of type
+        GmailContact, the contact to add.
+
+        The old signature of:
+        addContact(name, email, notes='') is still
+        supported, but deprecated. 
+        """
+        if len(extra_args) > 0:
+            # The user has passed in extra arguments
+            # He/she is probably trying to invoke addContact
+            # using the old, deprecated signature of:
+            # addContact(self, name, email, notes='')        
+            # Build a GmailContact object and use that instead
+            (name, email) = (myContact, extra_args[0])
+            if len(extra_args) > 1:
+                notes = extra_args[1]
+            else:
+                notes = ''
+            myContact = GmailContact(-1, name, email, notes)
+
+        # TODO: In the ideal world, we'd extract these specific
+        # constants into a nice constants file
+        
+        # This mostly comes from the Johnvey Gmail API,
+        # but also from the gmail.py cited earlier
+        myURL = _buildURL(view='up')        
+
+        myDataList =  [ ('act','ec'),
+                        ('at', self._cookieJar._cookies['GMAIL_AT']), # Cookie data?
+                        ('ct_nm', myContact.getName()),
+                        ('ct_em', myContact.getEmail()),
+                        ('ct_id', -1 )
+                       ]
+
+        notes = myContact.getNotes()
+        if notes != '':
+            myDataList.append( ('ctf_n', notes) )
+
+        validinfokeys = [
+                        'i', # IM
+                        'p', # Phone
+                        'd', # Company
+                        'a', # ADR
+                        'e', # Email
+                        'm', # Mobile
+                        'b', # Pager
+                        'f', # Fax
+                        't', # Title
+                        'o', # Other
+                        ]
+
+        moreInfo = myContact.getMoreInfo()
+        ctsn_num = -1
+        if moreInfo != {}:
+            for ctsf,ctsf_data in moreInfo.items():
+                ctsn_num += 1
+                # data section header, WORK, HOME,...
+                sectionenum ='ctsn_%02d' % ctsn_num
+                myDataList.append( ( sectionenum, ctsf ))
+                ctsf_num = -1
+
+                if isinstance(ctsf_data[0],str):
+                    ctsf_num += 1
+                    # data section
+                    subsectionenum = 'ctsf_%02d_%02d_%s' % (ctsn_num, ctsf_num, ctsf_data[0])  # ie. ctsf_00_01_p
+                    myDataList.append( (subsectionenum, ctsf_data[1]) )
+                else:
+                    for info in ctsf_data:
+                        if validinfokeys.count(info[0]) > 0:
+                            ctsf_num += 1
+                            # data section
+                            subsectionenum = 'ctsf_%02d_%02d_%s' % (ctsn_num, ctsf_num, info[0])  # ie. ctsf_00_01_p
+                            myDataList.append( (subsectionenum, info[1]) )
+
+        myData = urllib.urlencode(myDataList)
+        request = urllib2.Request(myURL,
+                                  data = myData)
+        pageData = self._retrievePage(request)
+
+        if pageData.find("The contact was successfully added") == -1:
+            print pageData
+            if pageData.find("already has the email address") > 0:
+                raise Exception("Someone with same email already exists in Gmail.")
+            elif pageData.find("https://www.google.com/accounts/ServiceLogin";):
+                raise Exception("Login has expired.")
+            return False
+        else:
+            return True
+
+    def _removeContactById(self, id):
+        """
+        Attempts to remove the contact that occupies
+        id "id" from the gmail address book.
+        Returns True if successful,
+        False otherwise.
+
+        This is a little dangerous since you don't really
+        know who you're deleting. Really,
+        this should return the name or something of the
+        person we just killed.
+
+        Don't call this method.
+        You should be using removeContact instead.
+        """
+        myURL = _buildURL(search='contacts', ct_id = id, c=id, act='dc', at=self._cookieJar._cookies['GMAIL_AT'], view='up')
+        pageData = self._retrievePage(myURL)
+
+        if pageData.find("The contact has been deleted") == -1:
+            return False
+        else:
+            return True
+
+    def removeContact(self, gmailContact):
+        """
+        Attempts to remove the GmailContact passed in
+        Returns True if successful, False otherwise.
+        """
+        # Let's re-fetch the contact list to make
+        # sure we're really deleting the guy
+        # we think we're deleting
+        newContactList = self.getContacts()
+        newVersionOfPersonToDelete = newContactList.getContactById(gmailContact.getId())
+        # Ok, now we need to ensure that gmailContact
+        # is the same as newVersionOfPersonToDelete
+        # and then we can go ahead and delete him/her
+        if (gmailContact == newVersionOfPersonToDelete):
+            return self._removeContactById(gmailContact.getId())
+        else:
+            # We have a cache coherency problem -- someone
+            # else now occupies this ID slot.
+            # TODO: Perhaps signal this in some nice way
+            #       to the end user?
+            
+            print "Unable to delete."
+            print "Has someone else been modifying the contacts list while we have?"
+            print "Old version of person:",gmailContact
+            print "New version of person:",newVersionOfPersonToDelete
+            return False
+
+## Don't remove this. contact stas
+##    def _getSpecInfo(self,id):
+##        """
+##        Return all the notes data.
+##        This is currently not used due to the fact that it requests pages in 
+##        a dos attack manner.
+##        """
+##        myURL =_buildURL(search='contacts',ct_id=id,c=id,\
+##                        at=self._cookieJar._cookies['GMAIL_AT'],view='ct')
+##        pageData = self._retrievePage(myURL)
+##        myData = self._parsePage(myURL)
+##        #print "\nmyData form _getSpecInfo\n",myData
+##        rawnotes = myData['cov'][7]
+##        return rawnotes
+
+class GmailContact:
+    """
+    Class for storing a Gmail Contacts list entry
+    """
+    def __init__(self, name, email, *extra_args):
+        """
+        Returns a new GmailContact object
+        (you can then call addContact on this to commit
+         it to the Gmail addressbook, for example)
+
+        Consider calling setNotes() and setMoreInfo()
+        to add extended information to this contact
+        """
+        # Support populating other fields if we're trying
+        # to invoke this the old way, with the old constructor
+        # whose signature was __init__(self, id, name, email, notes='')
+        id = -1
+        notes = ''
+   
+        if len(extra_args) > 0:
+            (id, name) = (name, email)
+            email = extra_args[0]
+            if len(extra_args) > 1:
+                notes = extra_args[1]
+            else:
+                notes = ''
+
+        self.id = id
+        self.name = name
+        self.email = email
+        self.notes = notes
+        self.moreInfo = {}
+    def __str__(self):
+        return "%s %s %s %s" % (self.id, self.name, self.email, self.notes)
+    def __eq__(self, other):
+        if not isinstance(other, GmailContact):
+            return False
+        return (self.getId() == other.getId()) and \
+               (self.getName() == other.getName()) and \
+               (self.getEmail() == other.getEmail()) and \
+               (self.getNotes() == other.getNotes())
+    def getId(self):
+        return self.id
+    def getName(self):
+        return self.name
+    def getEmail(self):
+        return self.email
+    def getNotes(self):
+        return self.notes
+    def setNotes(self, notes):
+        """
+        Sets the notes field for this GmailContact
+        Note that this does NOT change the note
+        field on Gmail's end; only adding or removing
+        contacts modifies them
+        """
+        self.notes = notes
+
+    def getMoreInfo(self):
+        return self.moreInfo
+    def setMoreInfo(self, moreInfo):
+        """
+        moreInfo format
+        ---------------
+        Use special key values::
+                        'i' =  IM
+                        'p' =  Phone
+                        'd' =  Company
+                        'a' =  ADR
+                        'e' =  Email
+                        'm' =  Mobile
+                        'b' =  Pager
+                        'f' =  Fax
+                        't' =  Title
+                        'o' =  Other
+
+        Simple example::
+
+        moreInfo = {'Home': ( ('a','852 W Barry'),
+                              ('p', '1-773-244-1980'),
+                              ('i', 'aim:brianray34') ) }
+
+        Complex example::
+
+        moreInfo = {
+            'Personal': (('e', 'Home Email'),
+                         ('f', 'Home Fax')),
+            'Work': (('d', 'Sample Company'),
+                     ('t', 'Job Title'),
+                     ('o', 'Department: Department1'),
+                     ('o', 'Department: Department2'),
+                     ('p', 'Work Phone'),
+                     ('m', 'Mobile Phone'),
+                     ('f', 'Work Fax'),
+                     ('b', 'Pager')) }
+        """
+        self.moreInfo = moreInfo 
+    def getVCard(self):
+        """Returns a vCard 3.0 for this
+        contact, as a string"""
+        # The \r is is to comply with the RFC2425 section 5.8.1
+        vcard = "BEGIN:VCARD\r\n"
+        vcard += "VERSION:3.0\r\n"
+        ## Deal with multiline notes
+        ##vcard += "NOTE:%s\n" % self.getNotes().replace("\n","\\n")
+        vcard += "NOTE:%s\r\n" % self.getNotes()
+        # Fake-out N by splitting up whatever we get out of getName
+        # This might not always do 'the right thing'
+        # but it's a *reasonable* compromise
+        fullname = self.getName().split()
+        fullname.reverse()
+        vcard += "N:%s" % ';'.join(fullname) + "\r\n"
+        vcard += "FN:%s\r\n" % self.getName()
+        vcard += "EMAIL;TYPE=INTERNET:%s\r\n" % self.getEmail()
+        vcard += "END:VCARD\r\n\r\n"
+        # Final newline in case we want to put more than one in a file
+        return vcard
+
+class GmailContactList:
+    """
+    Class for storing an entire Gmail contacts list
+    and retrieving contacts by Id, Email address, and name
+    """
+    def __init__(self, contactList):
+        self.contactList = contactList
+    def __str__(self):
+        return '\n'.join([str(item) for item in self.contactList])
+    def getCount(self):
+        """
+        Returns number of contacts
+        """
+        return len(self.contactList)
+    def getAllContacts(self):
+        """
+        Returns an array of all the
+        GmailContacts
+        """
+        return self.contactList
+    def getContactByName(self, name):
+        """
+        Gets the first contact in the
+        address book whose name is 'name'.
+
+        Returns False if no contact
+        could be found
+        """
+        nameList = self.getContactListByName(name)
+        if len(nameList) > 0:
+            return nameList[0]
+        else:
+            return False
+    def getContactByEmail(self, email):
+        """
+        Gets the first contact in the
+        address book whose name is 'email'.
+        As of this writing, Gmail insists
+        upon a unique email; i.e. two contacts
+        cannot share an email address.
+
+        Returns False if no contact
+        could be found
+        """
+        emailList = self.getContactListByEmail(email)
+        if len(emailList) > 0:
+            return emailList[0]
+        else:
+            return False
+    def getContactById(self, myId):
+        """
+        Gets the first contact in the
+        address book whose id is 'myId'.
+
+        REMEMBER: ID IS A STRING
+
+        Returns False if no contact
+        could be found
+        """
+        idList = self.getContactListById(myId)
+        if len(idList) > 0:
+            return idList[0]
+        else:
+            return False
+    def getContactListByName(self, name):
+        """
+        This function returns a LIST
+        of GmailContacts whose name is
+        'name'. 
+
+        Returns an empty list if no contacts
+        were found
+        """
+        nameList = []
+        for entry in self.contactList:
+            if entry.getName() == name:
+                nameList.append(entry)
+        return nameList
+    def getContactListByEmail(self, email):
+        """
+        This function returns a LIST
+        of GmailContacts whose email is
+        'email'. As of this writing, two contacts
+        cannot share an email address, so this
+        should only return just one item.
+        But it doesn't hurt to be prepared?
+
+        Returns an empty list if no contacts
+        were found
+        """
+        emailList = []
+        for entry in self.contactList:
+            if entry.getEmail() == email:
+                emailList.append(entry)
+        return emailList
+    def getContactListById(self, myId):
+        """
+        This function returns a LIST
+        of GmailContacts whose id is
+        'myId'. We expect there only to
+        be one, but just in case!
+
+        Remember: ID IS A STRING
+
+        Returns an empty list if no contacts
+        were found
+        """
+        idList = []
+        for entry in self.contactList:
+            if entry.getId() == myId:
+                idList.append(entry)
+        return idList
+    def search(self, searchTerm):
+       """
+       This function returns a LIST
+       of GmailContacts whose name or
+       email address matches the 'searchTerm'.
+
+       Returns an empty list if no matches
+       were found.
+       """
+       searchResults = []
+       for entry in self.contactList:
+           p = re.compile(searchTerm, re.IGNORECASE)
+           if p.search(entry.getName()) or p.search(entry.getEmail()):
+               searchResults.append(entry)
+       return searchResults
+   
+class GmailSearchResult:
+    """
+    """
+
+    def __init__(self, account, search, threadsInfo):
+        """
+
+        `threadsInfo` -- As returned from Gmail but unbunched.
+        """
+        #print "\nthreadsInfo\n",threadsInfo
+        try:
+            if not type(threadsInfo[0]) is types.ListType:
+                threadsInfo = [threadsInfo]
+        except IndexError:
+            # print "No messages found"
+            pass            
+            
+        self._account = account
+        self.search = search # TODO: Turn into object + format nicely.
+        self._threads = []
+        
+        for thread in threadsInfo:
+            self._threads.append(GmailThread(self, thread[0]))
+
+
+    def __iter__(self):
+        """
+        """
+        return iter(self._threads)
+
+    def __len__(self):
+        """
+        """
+        return len(self._threads)
+
+    def __getitem__(self,key):
+        """
+        """
+        return self._threads.__getitem__(key)
+
+
+class GmailSessionState:
+    """
+    """
+
+    def __init__(self, account = None, filename = ""):
+        """
+        """
+        if account:
+            self.state = (account.name, account._cookieJar)
+        elif filename:
+            self.state = load(open(filename, "rb"))
+        else:
+            raise ValueError("GmailSessionState must be instantiated with " \
+                             "either GmailAccount object or filename.")
+
+
+    def save(self, filename):
+        """
+        """
+        dump(self.state, open(filename, "wb"), -1)
+
+
+class _LabelHandlerMixin(object):
+    """
+
+    Note: Because a message id can be used as a thread id this works for
+          messages as well as threads.
+    """
+    def __init__(self):
+        self._labels = None
+        
+    def _makeLabelList(self, labelList):
+        self._labels = labelList
+    
+    def addLabel(self, labelName):
+        """
+        """
+        # Note: It appears this also automatically creates new labels.
+        result = self._account._doThreadAction(U_ADDCATEGORY_ACTION+labelName,
+                                               self)
+        if not self._labels:
+            self._makeLabelList([])
+        # TODO: Caching this seems a little dangerous; suppress duplicates maybe?
+        self._labels.append(labelName)
+        return result
+
+
+    def removeLabel(self, labelName):
+        """
+        """
+        # TODO: Check label is already attached?
+        # Note: An error is not generated if the label is not already attached.
+        result = \
+               self._account._doThreadAction(U_REMOVECATEGORY_ACTION+labelName,
+                                             self)
+        
+        removeLabel = True
+        try:
+            self._labels.remove(labelName)
+        except:
+            removeLabel = False
+            pass
+    
+        # If we don't check both, we might end up in some weird inconsistent state
+        return result and removeLabel
+
+    def getLabels(self):
+        return self._labels
+    
+
+
+class GmailThread(_LabelHandlerMixin):
+    """
+    Note: As far as I can tell, the "canonical" thread id is always the same
+          as the id of the last message in the thread. But it appears that
+          the id of any message in the thread can be used to retrieve
+          the thread information.
+    
+    """
+
+    def __init__(self, parent, threadsInfo):
+        """
+        """
+        _LabelHandlerMixin.__init__(self)
+        
+        # TODO Handle this better?
+        self._parent = parent
+        self._account = self._parent._account
+        
+        self.id = threadsInfo[T_THREADID] # TODO: Change when canonical updated?
+        self.subject = threadsInfo[T_SUBJECT_HTML]
+
+        self.snippet = threadsInfo[T_SNIPPET_HTML]
+        #self.extraSummary = threadInfo[T_EXTRA_SNIPPET] #TODO: What is this?
+
+        # TODO: Store other info?
+        # Extract number of messages in thread/conversation.
+
+        self._authors = threadsInfo[T_AUTHORS_HTML]
+        self.info = threadsInfo
+    
+        try:
+            # TODO: Find out if this information can be found another way...
+            #       (Without another page request.)
+            self._length = int(re.search("\((\d+?)\)\Z",
+                                         self._authors).group(1))
+        except AttributeError,info:
+            # If there's no message count then the thread only has one message.
+            self._length = 1
+
+        # TODO: Store information known about the last message  (e.g. id)?
+        self._messages = []
+
+        # Populate labels
+        self._makeLabelList(threadsInfo[T_CATEGORIES])
+
+    def __getattr__(self, name):
+        """
+        Dynamically dispatch some interesting thread properties.
+        """
+        attrs = { 'unread': T_UNREAD,
+                  'star': T_STAR,
+                  'date': T_DATE_HTML,
+                  'authors': T_AUTHORS_HTML,
+                  'flags': T_FLAGS,
+                  'subject': T_SUBJECT_HTML,
+                  'snippet': T_SNIPPET_HTML,
+                  'categories': T_CATEGORIES,
+                  'attach': T_ATTACH_HTML,
+                  'matching_msgid': T_MATCHING_MSGID,
+                  'extra_snippet': T_EXTRA_SNIPPET }
+        if name in attrs:
+            return self.info[ attrs[name] ];
+
+        raise AttributeError("no attribute %s" % name)
+        
+    def __len__(self):
+        """
+        """
+        return self._length
+
+
+    def __iter__(self):
+        """
+        """
+        if not self._messages:
+            self._messages = self._getMessages(self)
+            
+        return iter(self._messages)
+
+    def __getitem__(self, key):
+        """
+        """
+        if not self._messages:
+            self._messages = self._getMessages(self)
+        try:
+            result = self._messages.__getitem__(key)
+        except IndexError:
+            result = []
+        return result
+
+    def _getMessages(self, thread):
+        """
+        """
+        # TODO: Do this better.
+        # TODO: Specify the query folder using our specific search?
+        items = self._account._parseSearchResult(U_QUERY_SEARCH,
+                                                 view = U_CONVERSATION_VIEW,
+                                                 th = thread.id,
+                                                 q = "in:anywhere")
+        result = []
+        # TODO: Handle this better?
+        # Note: This handles both draft & non-draft messages in a thread...
+        for key, isDraft in [(D_MSGINFO, False), (D_DRAFTINFO, True)]:
+            try:
+                msgsInfo = items[key]
+            except KeyError:
+                # No messages of this type (e.g. draft or non-draft)
+                continue
+            else:
+                # TODO: Handle special case of only 1 message in thread better?
+                if type(msgsInfo[0]) != types.ListType:
+                    msgsInfo = [msgsInfo]
+                for msg in msgsInfo:
+                    result += [GmailMessage(thread, msg, isDraft = isDraft)]
+                           
+
+        return result
+
+class GmailMessageStub(_LabelHandlerMixin):
+    """
+
+    Intended to be used where not all message information is known/required.
+
+    NOTE: This may go away.
+    """
+
+    # TODO: Provide way to convert this to a full `GmailMessage` instance
+    #       or allow `GmailMessage` to be created without all info?
+
+    def __init__(self, id = None, _account = None):
+        """
+        """
+        _LabelHandlerMixin.__init__(self)
+        self.id = id
+        self._account = _account
+    
+
+        
+class GmailMessage(object):
+    """
+    """
+    
+    def __init__(self, parent, msgData, isDraft = False):
+        """
+
+        Note: `msgData` can be from either D_MSGINFO or D_DRAFTINFO.
+        """
+        # TODO: Automatically detect if it's a draft or not?
+        # TODO Handle this better?
+        self._parent = parent
+        self._account = self._parent._account
+        
+        self.author = msgData[MI_AUTHORFIRSTNAME]
+        self.id = msgData[MI_MSGID]
+        self.number = msgData[MI_NUM]
+        self.subject = msgData[MI_SUBJECT]
+        self.to = msgData[MI_TO]
+        self.cc = msgData[MI_CC]
+        self.bcc = msgData[MI_BCC]
+        self.sender = msgData[MI_AUTHOREMAIL]
+        
+        self.attachments = [GmailAttachment(self, attachmentInfo)
+                            for attachmentInfo in msgData[MI_ATTACHINFO]]
+
+        # TODO: Populate additional fields & cache...(?)
+
+        # TODO: Handle body differently if it's from a draft?
+        self.isDraft = isDraft
+        
+        self._source = None
+
+
+    def _getSource(self):
+        """
+        """
+        if not self._source:
+            # TODO: Do this more nicely...?
+            # TODO: Strip initial white space & fix up last line ending
+            #       to make it legal as per RFC?
+            self._source = self._account.getRawMessage(self.id)
+
+        return self._source
+
+    source = property(_getSource, doc = "")
+        
+
+
+class GmailAttachment:
+    """
+    """
+
+    def __init__(self, parent, attachmentInfo):
+        """
+        """
+        # TODO Handle this better?
+        self._parent = parent
+        self._account = self._parent._account
+
+        self.id = attachmentInfo[A_ID]
+        self.filename = attachmentInfo[A_FILENAME]
+        self.mimetype = attachmentInfo[A_MIMETYPE]
+        self.filesize = attachmentInfo[A_FILESIZE]
+
+        self._content = None
+
+
+    def _getContent(self):
+        """
+        """
+        if not self._content:
+            # TODO: Do this a more nicely...?
+            self._content = self._account._retrievePage(
+                _buildURL(view=U_ATTACHMENT_VIEW, disp="attd",
+                          attid=self.id, th=self._parent._parent.id))
+            
+        return self._content
+
+    content = property(_getContent, doc = "")
+
+
+    def _getFullId(self):
+        """
+
+        Returns the "full path"/"full id" of the attachment. (Used
+        to refer to the file when forwarding.)
+
+        The id is of the form: "<thread_id>_<msg_id>_<attachment_id>"
+        
+        """
+        return "%s_%s_%s" % (self._parent._parent.id,
+                             self._parent.id,
+                             self.id)
+
+    _fullId = property(_getFullId, doc = "")
+
+
+
+class GmailComposedMessage:
+    """
+    """
+
+    def __init__(self, to, subject, body, cc = None, bcc = None,
+                 filenames = None, files = None):
+        """
+
+          `filenames` - list of the file paths of the files to attach.
+          `files` - list of objects implementing sub-set of
+                    `email.Message.Message` interface (`get_filename`,
+                    `get_content_type`, `get_payload`). This is to
+                    allow use of payloads from Message instances.
+                    TODO: Change this to be simpler class we define ourselves?
+        """
+        self.to = to
+        self.subject = subject
+        self.body = body
+        self.cc = cc
+        self.bcc = bcc
+        self.filenames = filenames
+        self.files = files
+
+
+
+if __name__ == "__main__":
+    import sys
+    from getpass import getpass
+
+    try:
+        name = sys.argv[1]
+    except IndexError:
+        name = raw_input("Gmail account name: ")
+        
+    pw = getpass("Password: ")
+    domain = raw_input("Domain? [leave blank for Gmail]: ")
+
+    ga = GmailAccount(name, pw, domain=domain)
+
+    print "\nPlease wait, logging in..."
+
+    try:
+        ga.login()
+    except GmailLoginFailure,e:
+        print "\nLogin failed. (%s)" % e.message
+    else:
+        print "Login successful.\n"
+
+        # TODO: Use properties instead?
+        quotaInfo = ga.getQuotaInfo()
+        quotaMbUsed = quotaInfo[QU_SPACEUSED]
+        quotaMbTotal = quotaInfo[QU_QUOTA]
+        quotaPercent = quotaInfo[QU_PERCENT]
+        print "%s of %s used. (%s)\n" % (quotaMbUsed, quotaMbTotal, quotaPercent)
+
+        searches = STANDARD_FOLDERS + ga.getLabelNames()
+        name = None
+        while 1:
+            try:
+                print "Select folder or label to list: (Ctrl-C to exit)"
+                for optionId, optionName in enumerate(searches):
+                    print "  %d. %s" % (optionId, optionName)
+                while not name:
+                    try:
+                        name = searches[int(raw_input("Choice: "))]
+                    except ValueError,info:
+                        print info
+                        name = None
+                if name in STANDARD_FOLDERS:
+                    result = ga.getMessagesByFolder(name, True)
+                else:
+                    result = ga.getMessagesByLabel(name, True)
+                    
+                if not len(result):
+                    print "No threads found in `%s`." % name
+                    break
+                name = None
+                tot = len(result)
+                
+                i = 0
+                for thread in result:
+                    print "%s messages in thread" % len(thread)
+                    print thread.id, len(thread), thread.subject
+                    for msg in thread:
+                        print "\n ", msg.id, msg.number, msg.author,msg.subject
+                        # Just as an example of other usefull things
+                        #print " ", msg.cc, msg.bcc,msg.sender
+                        i += 1
+                print
+                print "number of threads:",tot
+                print "number of messages:",i
+            except KeyboardInterrupt:
+                break
+            
+    print "\n\nDone."

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Jan 21 10:11:24 2008
@@ -139,7 +139,7 @@
 conduit/modules/FacebookModule/pyfacebook/Makefile
 conduit/modules/FspotModule/Makefile
 conduit/modules/GmailModule/Makefile
-conduit/modules/GmailModule/libgmail-0.1.6.2/Makefile
+conduit/modules/GmailModule/libgmail/Makefile
 conduit/modules/SmugMugModule/Makefile
 conduit/modules/SmugMugModule/SmugMugAPI/Makefile
 conduit/modules/YouTubeModule/Makefile

Modified: trunk/scripts/update-3rdparty-libs.sh
==============================================================================
--- trunk/scripts/update-3rdparty-libs.sh	(original)
+++ trunk/scripts/update-3rdparty-libs.sh	Mon Jan 21 10:11:24 2008
@@ -17,3 +17,14 @@
 #update pybackpack
 wget -qO - http://hg.west.spy.net/hg/python/backpack/archive/tip.tar.gz | tar --wildcards -xzOf - */backpack.py > conduit/modules/BackpackModule/backpack/backpack.py
 
+#update gmail
+FILES="CHANGELOG \
+        COPYING \
+        README \
+        gmail_transport.py \
+        lgconstants.py \
+        libgmail.py"
+for f in $FILES; do
+        wget http://libgmail.cvs.sourceforge.net/*checkout*/libgmail/libgmail/$f -O \
+        conduit/modules/GmailModule/libgmail/$f
+done



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]