Moved extensions to their own folder, so support has more meaning

12 files changed, 8 insertions, 28 deletions

diff --git a/service/pixelated/config/initialize_leap.py b/service/pixelated/config/initialize_leap.py
index 7b600bf8..1f8c5655 100644
--- a/service/pixelated/config/initialize_leap.py
+++ b/service/pixelated/config/initialize_leap.py
@@ -37,11 +37,11 @@ def init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint):
 
 
 def init_monkeypatches():
-    import pixelated.support.ext_protobuf
-    import pixelated.support.ext_sqlcipher
-    import pixelated.support.ext_esmtp_sender_factory
-    import pixelated.support.ext_fetch
-    import pixelated.support.ext_sync
-    import pixelated.support.ext_keymanager_fetch_key
-    import pixelated.support.ext_requests_urllib3
-    import pixelated.support.ext_shared_db
+    import pixelated.extensions.protobuf_socket
+    import pixelated.extensions.sqlcipher_wal
+    import pixelated.extensions.esmtp_sender_factory
+    import pixelated.extensions.incoming_decrypt_header
+    import pixelated.extensions.soledad_sync_exception
+    import pixelated.extensions.keymanager_fetch_key
+    import pixelated.extensions.requests_urllib3
+    import pixelated.extensions.shared_db
diff --git a/service/pixelated/extensions/__init__.py b/service/pixelated/extensions/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/service/pixelated/extensions/__init__.py
diff --git a/service/pixelated/support/ext_esmtp_sender_factory.py b/service/pixelated/extensions/esmtp_sender_factory.py
index 59aa90c8..59aa90c8 100644
--- a/service/pixelated/support/ext_esmtp_sender_factory.py
+++ b/service/pixelated/extensions/esmtp_sender_factory.py
diff --git a/service/pixelated/support/ext_fetch.py b/service/pixelated/extensions/incoming_decrypt_header.py
index 2db5dd1d..2db5dd1d 100644
--- a/service/pixelated/support/ext_fetch.py
+++ b/service/pixelated/extensions/incoming_decrypt_header.py
diff --git a/service/pixelated/support/ext_keymanager_fetch_key.py b/service/pixelated/extensions/keymanager_fetch_key.py
index d39d1f96..d39d1f96 100644
--- a/service/pixelated/support/ext_keymanager_fetch_key.py
+++ b/service/pixelated/extensions/keymanager_fetch_key.py
diff --git a/service/pixelated/support/ext_protobuf.py b/service/pixelated/extensions/protobuf_socket.py
index 548f5fd6..548f5fd6 100644
--- a/service/pixelated/support/ext_protobuf.py
+++ b/service/pixelated/extensions/protobuf_socket.py
diff --git a/service/pixelated/support/ext_requests_urllib3.py b/service/pixelated/extensions/requests_urllib3.py
index c4ec2438..c4ec2438 100644
--- a/service/pixelated/support/ext_requests_urllib3.py
+++ b/service/pixelated/extensions/requests_urllib3.py
diff --git a/service/pixelated/support/ext_shared_db.py b/service/pixelated/extensions/shared_db.py
index 3e8a978e..3e8a978e 100644
--- a/service/pixelated/support/ext_shared_db.py
+++ b/service/pixelated/extensions/shared_db.py
diff --git a/service/pixelated/support/ext_sync.py b/service/pixelated/extensions/soledad_sync_exception.py
index cb3204ad..cb3204ad 100644
--- a/service/pixelated/support/ext_sync.py
+++ b/service/pixelated/extensions/soledad_sync_exception.py
diff --git a/service/pixelated/support/ext_sqlcipher.py b/service/pixelated/extensions/sqlcipher_wal.py
index 776087bf..776087bf 100644
--- a/service/pixelated/support/ext_sqlcipher.py
+++ b/service/pixelated/extensions/sqlcipher_wal.py
diff --git a/service/pixelated/support/id_gen.py b/service/pixelated/support/id_gen.py
deleted file mode 100644
index 6cac7523..00000000
--- a/service/pixelated/support/id_gen.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2014 ThoughtWorks, Inc.
-#
-# Pixelated is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Pixelated 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 Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
-import hashlib
-
-
-def gen_pixelated_uid(mbox, leap_message_uid):
-    return hashlib.md5(mbox + str(leap_message_uid)).hexdigest()
diff --git a/service/test/unit/support/test_ext_keymanager_fetch_key.py b/service/test/unit/extensions/test_keymanager_fetch_key.py
index 8998198d..8998198d 100644
--- a/service/test/unit/support/test_ext_keymanager_fetch_key.py
+++ b/service/test/unit/extensions/test_keymanager_fetch_key.py