1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
diff --git a/MANIFEST.in b/MANIFEST.in
index 2ef76ae..d916528 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,21 +1,21 @@
recursive-include demos *.py *.yaml *.html *.css *.js *.xml *.sql README
recursive-include docs *
prune docs/build
-include tornado/speedups.c
-include tornado/test/README
-include tornado/test/csv_translations/fr_FR.csv
-include tornado/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.mo
-include tornado/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.po
-include tornado/test/options_test.cfg
-include tornado/test/static/robots.txt
-include tornado/test/static/sample.xml
-include tornado/test/static/sample.xml.gz
-include tornado/test/static/sample.xml.bz2
-include tornado/test/static/dir/index.html
-include tornado/test/static_foo.txt
-include tornado/test/templates/utf8.html
-include tornado/test/test.crt
-include tornado/test/test.key
+include tornado5/speedups.c
+include tornado5/test/README
+include tornado5/test/csv_translations/fr_FR.csv
+include tornado5/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.mo
+include tornado5/test/gettext_translations/fr_FR/LC_MESSAGES/tornado_test.po
+include tornado5/test/options_test.cfg
+include tornado5/test/static/robots.txt
+include tornado5/test/static/sample.xml
+include tornado5/test/static/sample.xml.gz
+include tornado5/test/static/sample.xml.bz2
+include tornado5/test/static/dir/index.html
+include tornado5/test/static_foo.txt
+include tornado5/test/templates/utf8.html
+include tornado5/test/test.crt
+include tornado5/test/test.key
include LICENSE
include README.rst
include runtests.sh
diff --git a/setup.py b/setup.py
index 36f57b2..82ca19d 100644
--- a/setup.py
+++ b/setup.py
@@ -113,8 +113,8 @@ if (platform.python_implementation() == 'CPython' and
# This extension builds and works on pypy as well, although pypy's jit
# produces equivalent performance.
kwargs['ext_modules'] = [
- Extension('tornado.speedups',
- sources=['tornado/speedups.c']),
+ Extension('tornado5.speedups',
+ sources=['tornado5/speedups.c']),
]
if os.environ.get('TORNADO_EXTENSION') != '1':
@@ -148,14 +148,14 @@ if (not hasattr(ssl, 'SSLContext') or
"backported the necessary changes to older versions).")
setup(
- name="tornado",
+ name="tornado5",
version=version,
- packages=["tornado", "tornado.test", "tornado.platform"],
+ packages=["tornado5", "tornado5.test", "tornado5.platform"],
package_data={
# data files need to be listed both here (which determines what gets
# installed) and in MANIFEST.in (which determines what gets included
# in the sdist tarball)
- "tornado.test": [
+ "tornado5.test": [
"README",
"csv_translations/fr_FR.csv",
"gettext_translations/fr_FR/LC_MESSAGES/tornado_test.mo",
diff --git a/tornado/util.py b/tornado/util.py
index a42ebeb..c3d4946 100644
--- a/tornado/util.py
+++ b/tornado/util.py
@@ -164,7 +164,7 @@ def import_object(name):
True
>>> import_object('tornado.escape.utf8') is tornado.escape.utf8
True
- >>> import_object('tornado') is tornado
+ >>> import_object('tornado5') is tornado5
True
>>> import_object('tornado.missing_module')
Traceback (most recent call last):
|
