diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-08-10 04:07:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-08-10 04:07:34 +0400 |
| commit | 7440fee85c6d2d4c5854337ae8bf3ed7aea91a50 (patch) | |
| tree | 1fdb611fab96ba5e7af468233211722e0ca2bb58 /release | |
| parent | f71ef0874413d30be6d6e74500aa0a45628b5188 (diff) | |
remove python2.x support
Diffstat (limited to 'release')
| -rw-r--r-- | release/ui/buttons_material.py | 6 | ||||
| -rw-r--r-- | release/ui/buttons_scene.py | 6 | ||||
| -rw-r--r-- | release/ui/buttons_world.py | 6 | ||||
| -rw-r--r-- | release/ui/space_console.py | 16 |
4 files changed, 3 insertions, 31 deletions
diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py index bbb575a14e2..056bd5d6c10 100644 --- a/release/ui/buttons_material.py +++ b/release/ui/buttons_material.py @@ -1,12 +1,6 @@ import bpy -# If python version is less than 2.4, try to get set stuff from module -try: - set -except: - from sets import Set as set - class MaterialButtonsPanel(bpy.types.Panel): __space_type__ = "BUTTONS_WINDOW" __region_type__ = "WINDOW" diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py index 2d8dc0eab33..d5ae95a2fb6 100644 --- a/release/ui/buttons_scene.py +++ b/release/ui/buttons_scene.py @@ -1,12 +1,6 @@ import bpy -# If python version is less than 2.4, try to get set stuff from module -try: - set -except: - from sets import Set as set - class RenderButtonsPanel(bpy.types.Panel): __space_type__ = "BUTTONS_WINDOW" __region_type__ = "WINDOW" diff --git a/release/ui/buttons_world.py b/release/ui/buttons_world.py index e44d7102511..62c720d09d1 100644 --- a/release/ui/buttons_world.py +++ b/release/ui/buttons_world.py @@ -1,12 +1,6 @@ import bpy -# If python version is less than 2.4, try to get set stuff from module -try: - set -except: - from sets import Set as set - class WorldButtonsPanel(bpy.types.Panel): __space_type__ = "BUTTONS_WINDOW" __region_type__ = "WINDOW" diff --git a/release/ui/space_console.py b/release/ui/space_console.py index 8814553e55f..2cf41a1f88f 100644 --- a/release/ui/space_console.py +++ b/release/ui/space_console.py @@ -99,19 +99,9 @@ def get_console(console_id): console = code.InteractiveConsole(namespace) - if sys.version.startswith('3'): - import io - stdout = io.StringIO() - stderr = io.StringIO() - elif sys.version.startswith('2.6'): - import io - stdout = io.BytesIO() # Py2x support - stderr = io.BytesIO() - else: - import cStringIO - stdout = cStringIO.StringIO() - stderr = cStringIO.StringIO() - + import io + stdout = io.StringIO() + stderr = io.StringIO() consoles[console_id]= namespace, console, stdout, stderr |