Add in the rule for disambiguating framework-modules and soc-modules with the same name.
diff --git a/PythonStyleGuide.wiki b/PythonStyleGuide.wiki
index 265cf1a..97d56c7 100644
--- a/PythonStyleGuide.wiki
+++ b/PythonStyleGuide.wiki
@@ -210,6 +210,13 @@
from b_soc import d
}}}
+Resolution of clashing names between soc-framework and soc-module modules should be done by prefixing the soc-module module with the name of the soc-module from which it was imported:
+
+{{{
+from soc.views.helper import url_patterns
+from soc.modules.gsoc.views.helper import url_patterns as gsoc_url_patterns
+}}}
+
== Naming ==
=== Names to avoid ===
@@ -273,4 +280,4 @@
_Copyright 2008 Google Inc._
_This work is licensed under a_
[http://soc.googlecode.com/svn/wiki/html/licenses/cc-by-attribution-2_5.html Creative Commons Attribution 2.5 License].
-[http://creativecommons.org/licenses/by/2.5/ http://soc.googlecode.com/svn/wiki/html/licenses/cc-by-2_5-88x31.png]
+[http://creativecommons.org/licenses/by/2.5/ http://soc.googlecode.com/svn/wiki/html/licenses/cc-by-2_5-88x31.png]
\ No newline at end of file
