[#5076] Fixed missed test case and bad imports
Signed-off-by: Cory Johns <johnsca@geek.net>
diff --git a/ForgeGit/forgegit/model/git_repo.py b/ForgeGit/forgegit/model/git_repo.py
index cd4728b..4624600 100644
--- a/ForgeGit/forgegit/model/git_repo.py
+++ b/ForgeGit/forgegit/model/git_repo.py
@@ -10,7 +10,7 @@
import tg
import git
import gitdb
-from pylons import g
+from pylons import app_globals as g
from pymongo.errors import DuplicateKeyError
from ming.base import Object
diff --git a/ForgeHg/forgehg/model/hg.py b/ForgeHg/forgehg/model/hg.py
index 22c5bae..0212b4d 100644
--- a/ForgeHg/forgehg/model/hg.py
+++ b/ForgeHg/forgehg/model/hg.py
@@ -8,7 +8,7 @@
from ConfigParser import ConfigParser
import tg
-from pylons import g
+from pylons import app_globals as g
os.environ['HGRCPATH'] = '' # disable loading .hgrc
from mercurial import ui, hg
from pymongo.errors import DuplicateKeyError
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index 8ce62ec..e8173d8 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -13,11 +13,8 @@
import tg
import pysvn
-import pylons
-pylons.c = pylons.tmpl_context
-pylons.g = pylons.app_globals
from pymongo.errors import DuplicateKeyError
-from pylons import c, g
+from pylons import tmpl_context as c, app_globals as g
from ming.base import Object
from ming.orm import Mapper, FieldProperty, session
diff --git a/ForgeSVN/forgesvn/tests/test_tasks.py b/ForgeSVN/forgesvn/tests/test_tasks.py
index 1a6a5f6..c3173a4 100644
--- a/ForgeSVN/forgesvn/tests/test_tasks.py
+++ b/ForgeSVN/forgesvn/tests/test_tasks.py
@@ -46,7 +46,7 @@
with mock.patch.object(c.app.repo, 'init_as_clone') as f:
repo_tasks.clone('foo', 'bar', 'baz')
M.main_orm_session.flush()
- f.assert_called_with('foo', 'bar', 'baz', False)
+ f.assert_called_with('foo', 'bar', 'baz')
assert ns + 1 == M.Notification.query.find().count()
def test_refresh(self):
