diff options
| author | Ruben Pollan <meskio@sindominio.net> | 2015-01-02 21:05:22 -0600 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2015-01-05 12:14:56 -0300 |
| commit | 16920c065430c9892599b8b803aa6bbd4cd4f933 (patch) | |
| tree | e9fed6bfc83aeb220c00e49cd1752a82739df33d | |
| parent | 5bb6f18fe439b8edf99835e7a1f7030878edfbe0 (diff) | |
Port `enum` to `enum34`
| -rw-r--r-- | changes/bug-6601_port_enum34 | 1 | ||||
| -rw-r--r-- | pkg/requirements.pip | 2 | ||||
| -rw-r--r-- | src/leap/mail/imap/memorystore.py | 10 | ||||
| -rw-r--r-- | src/leap/mail/imap/messageparts.py | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/changes/bug-6601_port_enum34 b/changes/bug-6601_port_enum34 new file mode 100644 index 0000000..2ca551d --- /dev/null +++ b/changes/bug-6601_port_enum34 @@ -0,0 +1 @@ +- Port `enum` to `enum34` (Closes #6601) diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 17ceba6..5bd4972 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -4,4 +4,4 @@ leap.common>=0.3.7 leap.keymanager>=0.3.8 twisted # >= 12.0.3 ?? zope.proxy -enum +enum34 diff --git a/src/leap/mail/imap/memorystore.py b/src/leap/mail/imap/memorystore.py index 5eea4ef..e075394 100644 --- a/src/leap/mail/imap/memorystore.py +++ b/src/leap/mail/imap/memorystore.py @@ -52,10 +52,10 @@ logger = logging.getLogger(__name__) # soledad storage, in seconds. SOLEDAD_WRITE_PERIOD = 15 -FDOC = MessagePartType.fdoc.key -HDOC = MessagePartType.hdoc.key -CDOCS = MessagePartType.cdocs.key -DOCS_ID = MessagePartType.docs_id.key +FDOC = MessagePartType.fdoc.name +HDOC = MessagePartType.hdoc.name +CDOCS = MessagePartType.cdocs.name +DOCS_ID = MessagePartType.docs_id.name @contextlib.contextmanager @@ -73,7 +73,7 @@ def set_bool_flag(obj, att): setattr(obj, att, False) -DirtyState = Enum("none", "dirty", "new") +DirtyState = Enum("DirtyState", "none dirty new") class MemoryStore(object): diff --git a/src/leap/mail/imap/messageparts.py b/src/leap/mail/imap/messageparts.py index 257721c..fb1d75a 100644 --- a/src/leap/mail/imap/messageparts.py +++ b/src/leap/mail/imap/messageparts.py @@ -32,7 +32,7 @@ from leap.mail.imap import interfaces from leap.mail.imap.fields import fields from leap.mail.utils import empty, first, find_charset -MessagePartType = Enum("hdoc", "fdoc", "cdoc", "cdocs", "docs_id") +MessagePartType = Enum("MessagePartType", "hdoc fdoc cdoc cdocs docs_id") logger = logging.getLogger(__name__) |