Merge lp:~parthm/bzr/format_version_tuple_import_order into lp:bzr

[Parth Malwankar]

fixed import order of lazy_regex w.r.t _format_version_tuple definition in bzrlib

This patch changes the import order of lazy_regex w.r.t _format_version_tuple definition in bzrlib.__init__.py as suggested by spiv on IRC to fix the "AttributeError: 'module' object has no attribute '_format_version_tuple'" that was faced while using deperacted_function in osutils.

[Andrew Bennetts (spiv)]

22 +# lazy_regex import must be done after _format_version_tuple definition
23 +# to avoid "no attribute '_format_version_tuple'" error.

I think I'd be even more explicit here, and add " when using deprecated_function in the lazy_regex module."

There's a bit of a tension here between "install lazy_regex as early as possible (and magic the lazy_regex magic in this file as visible as possible)" and "make sure all of bzrlib/__init__.py has run before any submodules are imported" but I think this is a reasonable compromise.

review: Approve

[Parth Malwankar (parthm)]

sent to pqm by email

=== modified file 'bzrlib/__init__.py'
--- bzrlib/__init__.py	2010-06-26 02:15:26 +0000
+++ bzrlib/__init__.py	2010-07-01 03:14:23 +0000
@@ -38,13 +38,6 @@
 _start_time = time.time()
 
 import sys
-if getattr(sys, '_bzr_lazy_regex', False):
-    # The 'bzr' executable sets _bzr_lazy_regex.  We install the lazy regex
-    # hack as soon as possible so that as much of the standard library can
-    # benefit, including the 'string' module.
-    del sys._bzr_lazy_regex
-    import bzrlib.lazy_regex
-    bzrlib.lazy_regex.install_lazy_compile()
 
 
 IGNORE_FILENAME = ".bzrignore"
@@ -126,6 +119,18 @@
     return main_version + sub_string
 
 
+# lazy_regex import must be done after _format_version_tuple definition
+# to avoid "no attribute '_format_version_tuple'" error when using
+# deprecated_function in the lazy_regex module.
+if getattr(sys, '_bzr_lazy_regex', False):
+    # The 'bzr' executable sets _bzr_lazy_regex.  We install the lazy regex
+    # hack as soon as possible so that as much of the standard library can
+    # benefit, including the 'string' module.
+    del sys._bzr_lazy_regex
+    import bzrlib.lazy_regex
+    bzrlib.lazy_regex.install_lazy_compile()
+
+
 __version__ = _format_version_tuple(version_info)
 version_string = __version__