[Bf-extensions-cvs] [fe639c3] master: Reverted changes to render_renderfarmfi addon

[Sybren A. Stüvel]

Commit: fe639c3459aa9dd8b26eaac91aba1f19323780ef
Author: Sybren A. Stüvel
Date:   Fri Jan 23 17:39:20 2015 +0100
Branches: master
https://developer.blender.org/rBAfe639c3459aa9dd8b26eaac91aba1f19323780ef

Reverted changes to render_renderfarmfi addon

Some unintended changes ended up in d47e9be4fb204988ec659fc59882b2f5964afa3f;
this patch reverses those.

===================================================================

M	render_renderfarmfi/rpc.py
M	render_renderfarmfi/utils.py

===================================================================

diff --git a/render_renderfarmfi/rpc.py b/render_renderfarmfi/rpc.py
index 22c06e4..bb5d6a4 100644
--- a/render_renderfarmfi/rpc.py
+++ b/render_renderfarmfi/rpc.py
@@ -17,7 +17,7 @@
 # ##### END GPL LICENSE BLOCK #####
 
 import xmlrpc.client
-import importlib
+import imp
 import time
 import bpy
 
@@ -31,9 +31,9 @@ def _is_dev():
     pwfile = bpy.utils.user_resource('CONFIG', 'rffi', True)
     pwmod = None
     try:
-        pwmod = implib.find_module('rffi_dev',[pwfile])
+        pwmod = imp.find_module('rffi_dev',[pwfile])
         try:
-            user_creds = implib.load_module('rffi_dev', pwmod[0], pwmod[1], pwmod[2])
+            user_creds = imp.load_module('rffi_dev', pwmod[0], pwmod[1], pwmod[2])
             if 'dev' in dir(user_creds) and user_creds.dev:
                 is_dev = True
         except ImportError:
@@ -52,9 +52,9 @@ def _be_verbose():
     pwfile = bpy.utils.user_resource('CONFIG', 'rffi', True)
     pwmod = None
     try:
-        pwmod = implib.find_module('rffi_dev',[pwfile])
+        pwmod = imp.find_module('rffi_dev',[pwfile])
         try:
-            user_creds = implib.load_module('rffi_dev', pwmod[0], pwmod[1], pwmod[2])
+            user_creds = imp.load_module('rffi_dev', pwmod[0], pwmod[1], pwmod[2])
             if 'verbose' in dir(user_creds) and user_creds.verbose:
                 be_verbose = True
         except ImportError:
diff --git a/render_renderfarmfi/utils.py b/render_renderfarmfi/utils.py
index 50e18cf..8afcfd7 100644
--- a/render_renderfarmfi/utils.py
+++ b/render_renderfarmfi/utils.py
@@ -16,7 +16,7 @@
 #
 # ##### END GPL LICENSE BLOCK #####
 
-import importlib
+import imp
 
 from os.path import join
 
@@ -37,12 +37,12 @@ def _read_credentials():
 
     pwfile = bpy.utils.user_resource('CONFIG', 'rffi', True)
     try:
-        pwmod = implib.find_module('rffi_credentials',[pwfile])
+        pwmod = imp.find_module('rffi_credentials',[pwfile])
     except ImportError:
         _write_credentials('', '')
-        pwmod = implib.find_module('rffi_credentials',[pwfile])
+        pwmod = imp.find_module('rffi_credentials',[pwfile])
     try:
-        user_creds = implib.load_module('rffi_credentials', pwmod[0], pwmod[1], pwmod[2])
+        user_creds = imp.load_module('rffi_credentials', pwmod[0], pwmod[1], pwmod[2])
         bpy.rffi_user = user_creds.user
         bpy.rffi_hash = user_creds.hash
         bpy.rffi_creds_found = True
@@ -50,9 +50,9 @@ def _read_credentials():
         # doesn't exist yet, write template
         _write_credentials('', '')
         pwfile = bpy.utils.user_resource('CONFIG', 'rffi', True)
-        pwmod = implib.find_module('rffi_credentials',[pwfile])
+        pwmod = imp.find_module('rffi_credentials',[pwfile])
         try:
-            user_creds = implib.load_module('rffi_credentials', pwmod[0], pwmod[1], pwmod[2])
+            user_creds = imp.load_module('rffi_credentials', pwmod[0], pwmod[1], pwmod[2])
             bpy.rffi_user = user_creds.user
             bpy.rffi_hash = user_creds.hash
             bpy.rffi_creds_found = True