From ca1baa307298852b168d17558e4990fafd9036a0 Mon Sep 17 00:00:00 2001
From: Aleksander Vognild Burkow <aleksanderburkow@gmail.com>
Date: Tue, 29 Nov 2016 10:46:36 +0100
Subject: [PATCH 1/2] Move sqlalchemy from 2 to 2and3

---
 third_party/{2 => 2and3}/sqlalchemy/__init__.pyi                | 0
 third_party/{2 => 2and3}/sqlalchemy/databases/__init__.pyi      | 0
 third_party/{2 => 2and3}/sqlalchemy/databases/mysql.pyi         | 0
 third_party/{2 => 2and3}/sqlalchemy/dialects/__init__.pyi       | 0
 third_party/{2 => 2and3}/sqlalchemy/dialects/mysql/__init__.pyi | 0
 third_party/{2 => 2and3}/sqlalchemy/dialects/mysql/base.pyi     | 0
 third_party/{2 => 2and3}/sqlalchemy/engine/__init__.pyi         | 0
 third_party/{2 => 2and3}/sqlalchemy/engine/base.pyi             | 0
 third_party/{2 => 2and3}/sqlalchemy/engine/strategies.pyi       | 0
 third_party/{2 => 2and3}/sqlalchemy/engine/url.pyi              | 0
 third_party/{2 => 2and3}/sqlalchemy/exc.pyi                     | 0
 third_party/{2 => 2and3}/sqlalchemy/inspection.pyi              | 0
 third_party/{2 => 2and3}/sqlalchemy/log.pyi                     | 0
 third_party/{2 => 2and3}/sqlalchemy/orm/__init__.pyi            | 0
 third_party/{2 => 2and3}/sqlalchemy/orm/session.pyi             | 0
 third_party/{2 => 2and3}/sqlalchemy/pool.pyi                    | 0
 third_party/{2 => 2and3}/sqlalchemy/schema.pyi                  | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/__init__.pyi            | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/annotation.pyi          | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/base.pyi                | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/ddl.pyi                 | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/dml.pyi                 | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/elements.pyi            | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/expression.pyi          | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/functions.pyi           | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/naming.pyi              | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/operators.pyi           | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/schema.pyi              | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/selectable.pyi          | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/sqltypes.pyi            | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/type_api.pyi            | 0
 third_party/{2 => 2and3}/sqlalchemy/sql/visitors.pyi            | 0
 third_party/{2 => 2and3}/sqlalchemy/types.pyi                   | 0
 third_party/{2 => 2and3}/sqlalchemy/util/__init__.pyi           | 0
 third_party/{2 => 2and3}/sqlalchemy/util/_collections.pyi       | 0
 third_party/{2 => 2and3}/sqlalchemy/util/compat.pyi             | 0
 third_party/{2 => 2and3}/sqlalchemy/util/deprecations.pyi       | 0
 third_party/{2 => 2and3}/sqlalchemy/util/langhelpers.pyi        | 0
 38 files changed, 0 insertions(+), 0 deletions(-)
 rename third_party/{2 => 2and3}/sqlalchemy/__init__.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/databases/__init__.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/databases/mysql.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/dialects/__init__.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/dialects/mysql/__init__.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/dialects/mysql/base.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/engine/__init__.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/engine/base.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/engine/strategies.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/engine/url.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/exc.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/inspection.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/log.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/orm/__init__.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/orm/session.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/pool.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/schema.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/__init__.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/annotation.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/base.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/ddl.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/dml.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/elements.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/expression.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/functions.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/naming.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/operators.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/schema.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/selectable.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/sqltypes.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/type_api.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/sql/visitors.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/types.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/util/__init__.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/util/_collections.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/util/compat.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/util/deprecations.pyi (100%)
 rename third_party/{2 => 2and3}/sqlalchemy/util/langhelpers.pyi (100%)

diff --git a/third_party/2/sqlalchemy/__init__.pyi b/third_party/2and3/sqlalchemy/__init__.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/__init__.pyi
rename to third_party/2and3/sqlalchemy/__init__.pyi
diff --git a/third_party/2/sqlalchemy/databases/__init__.pyi b/third_party/2and3/sqlalchemy/databases/__init__.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/databases/__init__.pyi
rename to third_party/2and3/sqlalchemy/databases/__init__.pyi
diff --git a/third_party/2/sqlalchemy/databases/mysql.pyi b/third_party/2and3/sqlalchemy/databases/mysql.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/databases/mysql.pyi
rename to third_party/2and3/sqlalchemy/databases/mysql.pyi
diff --git a/third_party/2/sqlalchemy/dialects/__init__.pyi b/third_party/2and3/sqlalchemy/dialects/__init__.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/dialects/__init__.pyi
rename to third_party/2and3/sqlalchemy/dialects/__init__.pyi
diff --git a/third_party/2/sqlalchemy/dialects/mysql/__init__.pyi b/third_party/2and3/sqlalchemy/dialects/mysql/__init__.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/dialects/mysql/__init__.pyi
rename to third_party/2and3/sqlalchemy/dialects/mysql/__init__.pyi
diff --git a/third_party/2/sqlalchemy/dialects/mysql/base.pyi b/third_party/2and3/sqlalchemy/dialects/mysql/base.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/dialects/mysql/base.pyi
rename to third_party/2and3/sqlalchemy/dialects/mysql/base.pyi
diff --git a/third_party/2/sqlalchemy/engine/__init__.pyi b/third_party/2and3/sqlalchemy/engine/__init__.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/engine/__init__.pyi
rename to third_party/2and3/sqlalchemy/engine/__init__.pyi
diff --git a/third_party/2/sqlalchemy/engine/base.pyi b/third_party/2and3/sqlalchemy/engine/base.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/engine/base.pyi
rename to third_party/2and3/sqlalchemy/engine/base.pyi
diff --git a/third_party/2/sqlalchemy/engine/strategies.pyi b/third_party/2and3/sqlalchemy/engine/strategies.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/engine/strategies.pyi
rename to third_party/2and3/sqlalchemy/engine/strategies.pyi
diff --git a/third_party/2/sqlalchemy/engine/url.pyi b/third_party/2and3/sqlalchemy/engine/url.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/engine/url.pyi
rename to third_party/2and3/sqlalchemy/engine/url.pyi
diff --git a/third_party/2/sqlalchemy/exc.pyi b/third_party/2and3/sqlalchemy/exc.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/exc.pyi
rename to third_party/2and3/sqlalchemy/exc.pyi
diff --git a/third_party/2/sqlalchemy/inspection.pyi b/third_party/2and3/sqlalchemy/inspection.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/inspection.pyi
rename to third_party/2and3/sqlalchemy/inspection.pyi
diff --git a/third_party/2/sqlalchemy/log.pyi b/third_party/2and3/sqlalchemy/log.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/log.pyi
rename to third_party/2and3/sqlalchemy/log.pyi
diff --git a/third_party/2/sqlalchemy/orm/__init__.pyi b/third_party/2and3/sqlalchemy/orm/__init__.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/orm/__init__.pyi
rename to third_party/2and3/sqlalchemy/orm/__init__.pyi
diff --git a/third_party/2/sqlalchemy/orm/session.pyi b/third_party/2and3/sqlalchemy/orm/session.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/orm/session.pyi
rename to third_party/2and3/sqlalchemy/orm/session.pyi
diff --git a/third_party/2/sqlalchemy/pool.pyi b/third_party/2and3/sqlalchemy/pool.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/pool.pyi
rename to third_party/2and3/sqlalchemy/pool.pyi
diff --git a/third_party/2/sqlalchemy/schema.pyi b/third_party/2and3/sqlalchemy/schema.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/schema.pyi
rename to third_party/2and3/sqlalchemy/schema.pyi
diff --git a/third_party/2/sqlalchemy/sql/__init__.pyi b/third_party/2and3/sqlalchemy/sql/__init__.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/__init__.pyi
rename to third_party/2and3/sqlalchemy/sql/__init__.pyi
diff --git a/third_party/2/sqlalchemy/sql/annotation.pyi b/third_party/2and3/sqlalchemy/sql/annotation.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/annotation.pyi
rename to third_party/2and3/sqlalchemy/sql/annotation.pyi
diff --git a/third_party/2/sqlalchemy/sql/base.pyi b/third_party/2and3/sqlalchemy/sql/base.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/base.pyi
rename to third_party/2and3/sqlalchemy/sql/base.pyi
diff --git a/third_party/2/sqlalchemy/sql/ddl.pyi b/third_party/2and3/sqlalchemy/sql/ddl.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/ddl.pyi
rename to third_party/2and3/sqlalchemy/sql/ddl.pyi
diff --git a/third_party/2/sqlalchemy/sql/dml.pyi b/third_party/2and3/sqlalchemy/sql/dml.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/dml.pyi
rename to third_party/2and3/sqlalchemy/sql/dml.pyi
diff --git a/third_party/2/sqlalchemy/sql/elements.pyi b/third_party/2and3/sqlalchemy/sql/elements.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/elements.pyi
rename to third_party/2and3/sqlalchemy/sql/elements.pyi
diff --git a/third_party/2/sqlalchemy/sql/expression.pyi b/third_party/2and3/sqlalchemy/sql/expression.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/expression.pyi
rename to third_party/2and3/sqlalchemy/sql/expression.pyi
diff --git a/third_party/2/sqlalchemy/sql/functions.pyi b/third_party/2and3/sqlalchemy/sql/functions.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/functions.pyi
rename to third_party/2and3/sqlalchemy/sql/functions.pyi
diff --git a/third_party/2/sqlalchemy/sql/naming.pyi b/third_party/2and3/sqlalchemy/sql/naming.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/naming.pyi
rename to third_party/2and3/sqlalchemy/sql/naming.pyi
diff --git a/third_party/2/sqlalchemy/sql/operators.pyi b/third_party/2and3/sqlalchemy/sql/operators.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/operators.pyi
rename to third_party/2and3/sqlalchemy/sql/operators.pyi
diff --git a/third_party/2/sqlalchemy/sql/schema.pyi b/third_party/2and3/sqlalchemy/sql/schema.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/schema.pyi
rename to third_party/2and3/sqlalchemy/sql/schema.pyi
diff --git a/third_party/2/sqlalchemy/sql/selectable.pyi b/third_party/2and3/sqlalchemy/sql/selectable.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/selectable.pyi
rename to third_party/2and3/sqlalchemy/sql/selectable.pyi
diff --git a/third_party/2/sqlalchemy/sql/sqltypes.pyi b/third_party/2and3/sqlalchemy/sql/sqltypes.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/sqltypes.pyi
rename to third_party/2and3/sqlalchemy/sql/sqltypes.pyi
diff --git a/third_party/2/sqlalchemy/sql/type_api.pyi b/third_party/2and3/sqlalchemy/sql/type_api.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/type_api.pyi
rename to third_party/2and3/sqlalchemy/sql/type_api.pyi
diff --git a/third_party/2/sqlalchemy/sql/visitors.pyi b/third_party/2and3/sqlalchemy/sql/visitors.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/sql/visitors.pyi
rename to third_party/2and3/sqlalchemy/sql/visitors.pyi
diff --git a/third_party/2/sqlalchemy/types.pyi b/third_party/2and3/sqlalchemy/types.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/types.pyi
rename to third_party/2and3/sqlalchemy/types.pyi
diff --git a/third_party/2/sqlalchemy/util/__init__.pyi b/third_party/2and3/sqlalchemy/util/__init__.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/util/__init__.pyi
rename to third_party/2and3/sqlalchemy/util/__init__.pyi
diff --git a/third_party/2/sqlalchemy/util/_collections.pyi b/third_party/2and3/sqlalchemy/util/_collections.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/util/_collections.pyi
rename to third_party/2and3/sqlalchemy/util/_collections.pyi
diff --git a/third_party/2/sqlalchemy/util/compat.pyi b/third_party/2and3/sqlalchemy/util/compat.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/util/compat.pyi
rename to third_party/2and3/sqlalchemy/util/compat.pyi
diff --git a/third_party/2/sqlalchemy/util/deprecations.pyi b/third_party/2and3/sqlalchemy/util/deprecations.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/util/deprecations.pyi
rename to third_party/2and3/sqlalchemy/util/deprecations.pyi
diff --git a/third_party/2/sqlalchemy/util/langhelpers.pyi b/third_party/2and3/sqlalchemy/util/langhelpers.pyi
similarity index 100%
rename from third_party/2/sqlalchemy/util/langhelpers.pyi
rename to third_party/2and3/sqlalchemy/util/langhelpers.pyi

From 483a7b9306d2d6a09a837a2c802f9f2178701e75 Mon Sep 17 00:00:00 2001
From: Aleksander Vognild Burkow <aleksanderburkow@gmail.com>
Date: Tue, 29 Nov 2016 10:46:58 +0100
Subject: [PATCH 2/2] Use typing.Text text_type in sqlalchemy/util/compat.pyi

---
 third_party/2and3/sqlalchemy/util/compat.pyi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/third_party/2and3/sqlalchemy/util/compat.pyi b/third_party/2and3/sqlalchemy/util/compat.pyi
index ee106361571c..61d77114ac71 100644
--- a/third_party/2and3/sqlalchemy/util/compat.pyi
+++ b/third_party/2and3/sqlalchemy/util/compat.pyi
@@ -1,6 +1,6 @@
 # Stubs for sqlalchemy.util.compat (Python 2)
 
-from typing import Any
+from typing import Any, Text
 from collections import namedtuple
 
 import threading
@@ -34,7 +34,7 @@ def inspect_getargspec(func): ...
 
 string_types = ... # type: Any
 binary_type = ... # type: Any
-text_type = unicode
+text_type = Text
 int_types = ... # type: Any
 
 def callable(fn): ...