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
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
--- a/engine/python/fife/extensions/fife_settings.py
+++ b/engine/python/fife/extensions/fife_settings.py
@@ -29,11 +29,6 @@
It is by no means complete but it does provide a good starting point.
"""
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
-from builtins import range
-from builtins import object
import shutil
import os
from io import StringIO
--- a/engine/python/fife/extensions/pychan/dialogs.py
+++ b/engine/python/fife/extensions/pychan/dialogs.py
@@ -21,12 +21,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
# ####################################################################
-from __future__ import print_function
-from __future__ import absolute_import
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
-from builtins import object
from fife.extensions import pychan
from fife.extensions.pychan import loadXML
import fife.extensions.pychan.tools as tools
--- a/engine/python/fife/extensions/pychan/fife_pychansettings.py
+++ b/engine/python/fife/extensions/pychan/fife_pychansettings.py
@@ -29,9 +29,6 @@
pychan.
"""
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
import os
from io import BytesIO, StringIO, StringIO
--- a/engine/python/fife/extensions/pychan/fonts.py
+++ b/engine/python/fife/extensions/pychan/fonts.py
@@ -22,11 +22,6 @@
# ####################################################################
# Font handling
-from __future__ import absolute_import
-from future import standard_library
-standard_library.install_aliases()
-from builtins import map
-from builtins import object
import os.path
from .exceptions import *
from .fontfileparser import FontFileParser
--- a/engine/python/fife/extensions/serializers/simplexml.py
+++ b/engine/python/fife/extensions/serializers/simplexml.py
@@ -21,11 +21,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
# ####################################################################
-from future import standard_library
-standard_library.install_aliases()
-from builtins import str
-from past.builtins import basestring
-from builtins import object
import os
from io import BytesIO, StringIO
@@ -193,7 +188,7 @@
self.load()
self._initialized = True
- if not isinstance(name, basestring):
+ if not isinstance(name, str):
raise AttributeError("SimpleXMLSerializer.get(): Invalid type for "
"name argument.")
@@ -246,7 +241,7 @@
self.load()
self._initialized = True
- if not isinstance(name, basestring):
+ if not isinstance(name, str):
raise AttributeError("SimpleXMLSerializer.set(): Invalid type for "
"name argument.")
@@ -299,7 +294,7 @@
self.load()
self._initialized = True
- if not isinstance(name, basestring):
+ if not isinstance(name, str):
raise AttributeError("SimpleXMLSerializer.set(): Invalid type for "
"name argument.")
@@ -324,7 +319,7 @@
for c in self._root_element:
if c.tag == "Module":
name = c.get("name","")
- if not isinstance(name, basestring):
+ if not isinstance(name, str):
raise AttributeError("SimpleXMLSerializer.get(): Invalid "
"type for name argument.")
@@ -349,7 +344,7 @@
name = e.get("name", "")
# check the name
- if not isinstance(name, basestring):
+ if not isinstance(name, str):
raise AttributeError("SimpleXMLSerializer.get(): Invalid "
"type for name argument.")
element = e
@@ -410,7 +405,7 @@
@param module: The module to get from the settings tree
@type module: C{string}
"""
- if not isinstance(module, basestring):
+ if not isinstance(module, str):
raise AttributeError("Settings:_getModuleTree: Invalid type for "
"module argument.")
--- a/engine/python/fife/extensions/pychan/events.py
+++ b/engine/python/fife/extensions/pychan/events.py
@@ -58,13 +58,6 @@
----------------
"""
-from __future__ import print_function
-from __future__ import absolute_import
-
-from builtins import str
-from builtins import range
-from builtins import object
-from future.utils import itervalues
from .compat import fifechan
from . import exceptions
@@ -184,7 +177,7 @@
event = self.translateEvent(getEventType(name), event)
if name in self.events:
if self.debug: print("-"*self.indent, name)
- for f in itervalues(self.events[name]):
+ for f in self.events[name].values():
if not self._redirect:
f(event)
continue
--- a/engine/python/fife/extensions/serializers/xml_loader_tools.py
+++ b/engine/python/fife/extensions/serializers/xml_loader_tools.py
@@ -21,11 +21,6 @@
# ####################################################################
""" utilities for xml maploading process """
-from __future__ import print_function
-from __future__ import division
-
-from builtins import range
-from past.utils import old_div
import os
import math
@@ -151,6 +146,6 @@
else:
limit1 = float(limit1)
- count = int(math.ceil(old_div((limit2 - limit1),increment)))
+ count = int(math.ceil((limit2 - limit1),increment))
return (limit1 + n*increment for n in range(count))
|
