Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-03-07 14:53:40 +0300
committerCampbell Barton <ideasman42@gmail.com>2011-03-07 14:53:40 +0300
commitcfd9d6d190dc8fc35920714d252f6c93bd3d96f6 (patch)
tree360fc879522be7068bbfc1c8eeb6ee9443997abb /release/scripts/ui
parentdaff7a447e75a7901b7f3d782839c5a15c16efc1 (diff)
Drop support for python 3.1.
for building py3.2 on *nix see: http://wiki.blender.org/index.php?title=Dev:2.5/Doc/Building_Blender/Linux/Troubleshooting#Python also fixed possible buffer overrun with getting the fake filepath for a blender textblock.
Diffstat (limited to 'release/scripts/ui')
-rw-r--r--release/scripts/ui/space_userpref.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py
index 4f444a8e253..93985591824 100644
--- a/release/scripts/ui/space_userpref.py
+++ b/release/scripts/ui/space_userpref.py
@@ -1089,8 +1089,7 @@ class WM_OT_addon_install(bpy.types.Operator):
addon_path = ""
pyfile_dir = os.path.dirname(pyfile)
for addon_path in addon_utils.paths():
- # if os.path.samefile(pyfile_dir, addon_path): # Py3.2 only!, upgrade soon!
- if (hasattr(os.path, "samefile") and os.path.samefile(pyfile_dir, addon_path)) or pyfile_dir == addon_path:
+ if os.path.samefile(pyfile_dir, addon_path):
self.report({'ERROR'}, "Source file is in the addon search path: %r" % addon_path)
return {'CANCELLED'}
del addon_path