Rev 4791: Deprecate _maybe_expand_globs and remove calls to it. in http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b3-win32-shell-completion

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1.0b3-win32-shell-completion

------------------------------------------------------------
revno: 4791
revision-id: john at arbash-meinel.com-20091104223213-foo7qmu39b26zdac
parent: john at arbash-meinel.com-20091104222940-gfu8411ul047tihg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1.0b3-win32-shell-completion
timestamp: Wed 2009-11-04 16:32:13 -0600
message:
  Deprecate _maybe_expand_globs and remove calls to it.
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-11-03 20:24:25 +0000
+++ b/bzrlib/builtins.py	2009-11-04 22:32:13 +0000
@@ -655,7 +655,6 @@
         if base_tree:
             base_tree.lock_read()
         try:
-            file_list = self._maybe_expand_globs(file_list)
             tree, file_list = tree_files_for_add(file_list)
             added, ignored = tree.smart_add(file_list, not
                 no_recurse, action=action, save=not dry_run)

=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2009-11-04 22:26:25 +0000
+++ b/bzrlib/commands.py	2009-11-04 22:32:13 +0000
@@ -56,6 +56,7 @@
 from bzrlib.symbol_versioning import (
     deprecated_function,
     deprecated_in,
+    deprecated_method,
     suppress_deprecation_warnings,
     )
 
@@ -383,18 +384,18 @@
         # List of standard options directly supported
         self.supported_std_options = []
 
+    @deprecated_method(deprecated_in((2, 1, 0)))
     def _maybe_expand_globs(self, file_list):
         """Glob expand file_list if the platform does not do that itself.
 
+        Not used anymore, now that the bzr command-line parser globs on
+        Windows.
+
         :return: A possibly empty list of unicode paths.
 
         Introduced in bzrlib 0.18.
         """
-        if not file_list:
-            file_list = []
-        # if sys.platform == 'win32':
-        #     file_list = win32utils.glob_expand(file_list)
-        return list(file_list)
+        return file_list
 
     def _usage(self):
         """Return single-line grammar for this command.