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-04-01 06:41:15 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-04-01 06:41:15 +0400
commitc8652b301fb59eead1f76bf34215af5413ffa4aa (patch)
treec80cb73435621bce2c473c5063ab9e2c266be5c8 /build_files/buildbot
parent14e94d742e985488490cbbb74e6e1dc9923bc4c2 (diff)
pep8 checker, mostly pedantic style changes but also found an error in mesh_utils.mesh_linked_faces()
Diffstat (limited to 'build_files/buildbot')
-rw-r--r--build_files/buildbot/master_unpack.py8
-rw-r--r--build_files/buildbot/slave_pack.py16
2 files changed, 12 insertions, 12 deletions
diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py
index f97e53384b0..612b686b49a 100644
--- a/build_files/buildbot/master_unpack.py
+++ b/build_files/buildbot/master_unpack.py
@@ -94,11 +94,11 @@ if platform == '':
sys.exit(1)
# extract
-dir = 'public_html/download'
+directory = 'public_html/download'
try:
zf = z.open(package)
- f = file(os.path.join(dir, packagename), "wb")
+ f = file(os.path.join(directory, packagename), "wb")
shutil.copyfileobj(zf, f)
@@ -112,10 +112,10 @@ except Exception, ex:
# remove other files from the same platform
try:
- for f in os.listdir(dir):
+ for f in os.listdir(directory):
if platform.lower() in f.lower():
if f != packagename:
- os.remove(os.path.join(dir, f))
+ os.remove(os.path.join(directory, f))
except Exception, ex:
sys.stderr.write('Failed to remove old packages: %s\n' % str(ex))
sys.exit(1)
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 74d00bf9249..effe7751915 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -41,12 +41,12 @@ if builder.find('scons') != -1:
sys.exit(retcode)
# clean release directory if it already exists
-dir = 'release'
+directory = 'release'
-if os.path.exists(dir):
- for f in os.listdir(dir):
- if os.path.isfile(os.path.join(dir, f)):
- os.remove(os.path.join(dir, f))
+if os.path.exists(directory):
+ for f in os.listdir(directory):
+ if os.path.isfile(os.path.join(directory, f)):
+ os.remove(os.path.join(directory, f))
# create release package
try:
@@ -56,7 +56,7 @@ except Exception, ex:
sys.exit(1)
# find release directory, must exist this time
-if not os.path.exists(dir):
+if not os.path.exists(directory):
sys.stderr.write("Failed to find release directory.\n")
sys.exit(1)
@@ -64,8 +64,8 @@ if not os.path.exists(dir):
file = None
filepath = None
-for f in os.listdir(dir):
- rf = os.path.join(dir, f)
+for f in os.listdir(directory):
+ rf = os.path.join(directory, f)
if os.path.isfile(rf) and f.startswith('blender'):
file = f
filepath = rf