Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Updated six to version 1.4.1.

  • Loading branch information...
commit 7b623247e84f1cf47d4cae1500c40954ed8905a5 1 parent 34d52fd
Aymeric Augustin authored September 04, 2013

Showing 1 changed file with 16 additions and 16 deletions. Show diff stats Hide diff stats

  1. 32  django/utils/six.py
32  django/utils/six.py
@@ -25,7 +25,7 @@
25 25
 import types
26 26
 
27 27
 __author__ = "Benjamin Peterson <benjamin@python.org>"
28  
-__version__ = "1.4.0"
  28
+__version__ = "1.4.1"
29 29
 
30 30
 
31 31
 # Useful for very coarse version differentiation.
@@ -185,9 +185,9 @@ class _MovedItems(types.ModuleType):
185 185
     MovedModule("tkinter_messagebox", "tkMessageBox", "tkinter.messagebox"),
186 186
     MovedModule("tkinter_tksimpledialog", "tkSimpleDialog",
187 187
                 "tkinter.simpledialog"),
188  
-    MovedModule("urllib_parse", "six.moves.urllib_parse", "urllib.parse"),
189  
-    MovedModule("urllib_error", "six.moves.urllib_error", "urllib.error"),
190  
-    MovedModule("urllib", "six.moves.urllib", "six.moves.urllib"),
  188
+    MovedModule("urllib_parse", __name__ + ".moves.urllib_parse", "urllib.parse"),
  189
+    MovedModule("urllib_error", __name__ + ".moves.urllib_error", "urllib.error"),
  190
+    MovedModule("urllib", __name__ + ".moves.urllib", __name__ + ".moves.urllib"),
191 191
     MovedModule("urllib_robotparser", "robotparser", "urllib.robotparser"),
192 192
     MovedModule("winreg", "_winreg"),
193 193
 ]
@@ -195,7 +195,7 @@ class _MovedItems(types.ModuleType):
195 195
     setattr(_MovedItems, attr.name, attr)
196 196
 del attr
197 197
 
198  
-moves = sys.modules[__name__ + ".moves"] = _MovedItems("moves")
  198
+moves = sys.modules[__name__ + ".moves"] = _MovedItems(__name__ + ".moves")
199 199
 
200 200
 
201 201
 
@@ -223,8 +223,8 @@ class Module_six_moves_urllib_parse(types.ModuleType):
223 223
     setattr(Module_six_moves_urllib_parse, attr.name, attr)
224 224
 del attr
225 225
 
226  
-sys.modules[__name__ + ".moves.urllib_parse"] = Module_six_moves_urllib_parse("six.moves.urllib_parse")
227  
-sys.modules[__name__ + ".moves.urllib.parse"] = Module_six_moves_urllib_parse("six.moves.urllib.parse")
  226
+sys.modules[__name__ + ".moves.urllib_parse"] = Module_six_moves_urllib_parse(__name__ + ".moves.urllib_parse")
  227
+sys.modules[__name__ + ".moves.urllib.parse"] = Module_six_moves_urllib_parse(__name__ + ".moves.urllib.parse")
228 228
 
229 229
 
230 230
 class Module_six_moves_urllib_error(types.ModuleType):
@@ -240,8 +240,8 @@ class Module_six_moves_urllib_error(types.ModuleType):
240 240
     setattr(Module_six_moves_urllib_error, attr.name, attr)
241 241
 del attr
242 242
 
243  
-sys.modules[__name__ + ".moves.urllib_error"] = Module_six_moves_urllib_error("six.moves.urllib_error")
244  
-sys.modules[__name__ + ".moves.urllib.error"] = Module_six_moves_urllib_error("six.moves.urllib.error")
  243
+sys.modules[__name__ + ".moves.urllib_error"] = Module_six_moves_urllib_error(__name__ + ".moves.urllib_error")
  244
+sys.modules[__name__ + ".moves.urllib.error"] = Module_six_moves_urllib_error(__name__ + ".moves.urllib.error")
245 245
 
246 246
 
247 247
 class Module_six_moves_urllib_request(types.ModuleType):
@@ -286,8 +286,8 @@ class Module_six_moves_urllib_request(types.ModuleType):
286 286
     setattr(Module_six_moves_urllib_request, attr.name, attr)
287 287
 del attr
288 288
 
289  
-sys.modules[__name__ + ".moves.urllib_request"] = Module_six_moves_urllib_request("six.moves.urllib_request")
290  
-sys.modules[__name__ + ".moves.urllib.request"] = Module_six_moves_urllib_request("six.moves.urllib.request")
  289
+sys.modules[__name__ + ".moves.urllib_request"] = Module_six_moves_urllib_request(__name__ + ".moves.urllib_request")
  290
+sys.modules[__name__ + ".moves.urllib.request"] = Module_six_moves_urllib_request(__name__ + ".moves.urllib.request")
291 291
 
292 292
 
293 293
 class Module_six_moves_urllib_response(types.ModuleType):
@@ -304,8 +304,8 @@ class Module_six_moves_urllib_response(types.ModuleType):
304 304
     setattr(Module_six_moves_urllib_response, attr.name, attr)
305 305
 del attr
306 306
 
307  
-sys.modules[__name__ + ".moves.urllib_response"] = Module_six_moves_urllib_response("six.moves.urllib_response")
308  
-sys.modules[__name__ + ".moves.urllib.response"] = Module_six_moves_urllib_response("six.moves.urllib.response")
  307
+sys.modules[__name__ + ".moves.urllib_response"] = Module_six_moves_urllib_response(__name__ + ".moves.urllib_response")
  308
+sys.modules[__name__ + ".moves.urllib.response"] = Module_six_moves_urllib_response(__name__ + ".moves.urllib.response")
309 309
 
310 310
 
311 311
 class Module_six_moves_urllib_robotparser(types.ModuleType):
@@ -319,8 +319,8 @@ class Module_six_moves_urllib_robotparser(types.ModuleType):
319 319
     setattr(Module_six_moves_urllib_robotparser, attr.name, attr)
320 320
 del attr
321 321
 
322  
-sys.modules[__name__ + ".moves.urllib_robotparser"] = Module_six_moves_urllib_robotparser("six.moves.urllib_robotparser")
323  
-sys.modules[__name__ + ".moves.urllib.robotparser"] = Module_six_moves_urllib_robotparser("six.moves.urllib.robotparser")
  322
+sys.modules[__name__ + ".moves.urllib_robotparser"] = Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib_robotparser")
  323
+sys.modules[__name__ + ".moves.urllib.robotparser"] = Module_six_moves_urllib_robotparser(__name__ + ".moves.urllib.robotparser")
324 324
 
325 325
 
326 326
 class Module_six_moves_urllib(types.ModuleType):
@@ -332,7 +332,7 @@ class Module_six_moves_urllib(types.ModuleType):
332 332
     robotparser = sys.modules[__name__ + ".moves.urllib_robotparser"]
333 333
 
334 334
 
335  
-sys.modules[__name__ + ".moves.urllib"] = Module_six_moves_urllib("six.moves.urllib")
  335
+sys.modules[__name__ + ".moves.urllib"] = Module_six_moves_urllib(__name__ + ".moves.urllib")
336 336
 
337 337
 
338 338
 def add_move(move):

0 notes on commit 7b62324

Please sign in to comment.
Something went wrong with that request. Please try again.